Author: tveronezi
Date: Sat Nov 24 14:23:53 2012
New Revision: 1413192
URL: http://svn.apache.org/viewvc?rev=1413192&view=rev
Log:
-cosmetic
-use one "var" per variable like Douglas Crockford does here
http://javascript.crockford.com/code.html
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationToolbarView.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js?rev=1413192&r1=1413191&r2=1413192&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
Sat Nov 24 14:23:53 2012
@@ -104,7 +104,11 @@ TOMEE.ApplicationController = function (
});
channel.bind('server-command-callback-success', 'Login', function (params)
{
- if (!params.output.loginSuccess) {
+ if (params.output.loginSuccess) {
+ growl.showNotification(TOMEE.I18N.get('application.log.hello', {
+ userName: params.params.user
+ }), 'success');
+ } else {
growl.showNotification(TOMEE.I18N.get('application.log.bad'),
'error');
}
});
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js?rev=1413192&r1=1413191&r2=1413192&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/I18N.js
Sat Nov 24 14:23:53 2012
@@ -61,6 +61,7 @@ TOMEE.I18N = (function () {
'application.log.in':'Login',
'application.log.error':'Login error. Please try again.',
'application.log.bad':'Bad user or password. Please try again.',
+ 'application.log.hello':'Hello {{userName}}!',
'application.password':'Password',
'dummy':'dummy'
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationToolbarView.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationToolbarView.js?rev=1413192&r1=1413191&r2=1413192&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationToolbarView.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationToolbarView.js
Sat Nov 24 14:23:53 2012
@@ -19,9 +19,13 @@
TOMEE.ApplicationToolbarView = function () {
"use strict";
- var channel = TOMEE.ApplicationChannel,
- el = $(TOMEE.ApplicationTemplates.getValue('application-toolbar', {})),
- logoutBtn =
$(TOMEE.ApplicationTemplates.getValue('application-toolbar-logout-btn', {}));
+ var channel = TOMEE.ApplicationChannel;
+ var el = $(TOMEE.ApplicationTemplates.getValue('application-toolbar', {}));
+
+ var userNameMenu = el.find('.tomee-user-name');
+ var loginMenu = el.find('.user-login-dropdown');
+ var loginBtn = el.find('.tomee-login-btn');
+ var logoutBtn =
$(TOMEE.ApplicationTemplates.getValue('application-toolbar-logout-btn', {}));
el.find('.toolbar-item').on('click', function (ev) {
var tabEl = $(ev.currentTarget),
@@ -32,6 +36,16 @@ TOMEE.ApplicationToolbarView = function
});
});
+ userNameMenu.on('click', function() {
+ TOMEE.DelayedTask().delay(function() {
+ var user = el.find('.tomee-login');
+
+ if(loginMenu.hasClass('open') && user) {
+ user.focus();
+ }
+ }, 500);
+ });
+
channel.bind('ui-actions', 'locked-change', function (data) {
el.find('.toolbar-item').each(function (index, htmlElement) {
var element = $(htmlElement);
@@ -57,16 +71,15 @@ TOMEE.ApplicationToolbarView = function
});
});
- el.find('.tomee-login-btn').on('click', function () {
- var user = el.find('.tomee-login').val(),
- pass = el.find('.tomee-password').val(),
- btn = el.find('.tomee-login-btn');
+ loginBtn.on('click', function () {
+ var user = el.find('.tomee-login').val();
+ var pass = el.find('.tomee-password').val();
channel.send('ui-actions', 'login-btn-click', {
user:user,
pass:pass
});
- btn.prop('disabled', true);
+ loginBtn.prop('disabled', true);
});
logoutBtn.on('click', function () {
@@ -74,43 +87,37 @@ TOMEE.ApplicationToolbarView = function
});
channel.bind('server-command-callback-success', 'Login', function (params)
{
- var btn = el.find('.tomee-login-btn'),
- btnsArea = el.find('.login-buttons'),
- menu = el.find('.user-login-dropdown'),
- userNameMenu = el.find('.tomee-user-name'),
- user = el.find('.tomee-login'),
- pass = el.find('.tomee-password');
+ var btnsArea = el.find('.login-buttons');
+ var user = el.find('.tomee-login');
+ var pass = el.find('.tomee-password');
if (!params.output.loginSuccess) {
- btn.prop('disabled', false);
+ loginBtn.prop('disabled', false);
return;
}
- btn.remove();
+ loginBtn.remove();
user.remove();
pass.remove();
btnsArea.append(logoutBtn);
- menu.removeClass('open');
+ loginMenu.removeClass('open');
userNameMenu.html(user.val());
el.find('.login-menu').addClass('logout');
});
channel.bind('server-command-callback-success', 'session', function
(params) {
- var btn = el.find('.tomee-login-btn'),
- btnsArea = el.find('.login-buttons'),
- menu = el.find('.user-login-dropdown'),
- userNameMenu = el.find('.tomee-user-name'),
- user = el.find('.tomee-login'),
- pass = el.find('.tomee-password');
+ var btnsArea = el.find('.login-buttons');
+ var user = el.find('.tomee-login');
+ var pass = el.find('.tomee-password');
if (!params.data.userName) {
return;
}
- btn.remove();
+ loginBtn.remove();
user.remove();
pass.remove();
btnsArea.append(logoutBtn);
@@ -122,8 +129,7 @@ TOMEE.ApplicationToolbarView = function
});
channel.bind('server-command-callback-error', 'Login', function (params) {
- var btn = el.find('.tomee-login-btn');
- btn.prop('disabled', false);
+ loginBtn.prop('disabled', false);
});
return {
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js?rev=1413192&r1=1413191&r2=1413192&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
Sat Nov 24 14:23:53 2012
@@ -167,8 +167,8 @@ TOMEE.ApplicationView = function () {
containerWidth,
toolbarHeight = toolbar.getEl().outerHeight();
- containerHeight = Math.max(myWindow.outerHeight(),600);
- containerWidth = Math.max(myWindow.outerWidth(), 800);
+ containerHeight = myWindow.outerHeight();
+ containerWidth = myWindow.outerWidth();
container.css('height', containerHeight + 'px');
container.css('width', containerWidth + 'px');
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less?rev=1413192&r1=1413191&r2=1413192&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/tomee.less Sat
Nov 24 14:23:53 2012
@@ -21,7 +21,7 @@ body {
.growl-container {
position: absolute;
bottom: 40px;
- left: 40px;
+ left: 20px;
z-index: 5000;
.growl {
