Author: tveronezi
Date: Wed Oct 17 13:56:15 2012
New Revision: 1399268
URL: http://svn.apache.org/viewvc?rev=1399268&view=rev
Log:
JS code should handle connection issues.
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-disabled.handlebars
- copied, changed from r1399201,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application.handlebars
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-disconnected-popup.handlebars
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/ApplicationView.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js?rev=1399268&r1=1399267&r2=1399268&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationTemplates.js
Wed Oct 17 13:56:15 2012
@@ -45,6 +45,7 @@ TOMEE.ApplicationTemplates = (function (
};
})([
'application',
+ 'application-disabled',
'application-toolbar',
'application-toolbar-logout-btn',
'application-tab-console',
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-disabled.handlebars
(from r1399201,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application.handlebars)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-disabled.handlebars?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-disabled.handlebars&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application.handlebars&r1=1399201&r2=1399268&rev=1399268&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application.handlebars
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-disabled.handlebars
Wed Oct 17 13:56:15 2012
@@ -1 +1 @@
-<div class="tomee"></div>
\ No newline at end of file
+<div class="modal-backdrop fade in"></div>
\ No newline at end of file
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-disconnected-popup.handlebars
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-disconnected-popup.handlebars?rev=1399268&r1=1399267&r2=1399268&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-disconnected-popup.handlebars
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/templates/application-disconnected-popup.handlebars
Wed Oct 17 13:56:15 2012
@@ -1,11 +1,8 @@
-<div>
- <div class="modal hide fade in" style="display: block;">
- <div class="modal-header">
- <h3 id="myModalLabel">Connection exception</h3>
- </div>
- <div class="modal-body">
- <p>The application is not connected to the server.</p>
- </div>
+<div class="modal hide fade in" style="display: block;">
+ <div class="modal-header">
+ <h3 id="myModalLabel">{{i18n "connection.exception"}}</h3>
</div>
- <div class="modal-backdrop fade in"></div>
-</div>
+ <div class="modal-body">
+ <p>{{i18n "connection.exception.message"}}</p>
+ </div>
+</div>
\ No newline at end of file
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=1399268&r1=1399267&r2=1399268&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
Wed Oct 17 13:56:15 2012
@@ -24,6 +24,9 @@ TOMEE.I18N = (function () {
'ms':'ms',
+ 'connection.exception': 'Connection exception',
+ 'connection.exception.message': 'The application is waiting for the
server.',
+
'application.console':'Console',
'application.console.run':'Execute',
'application.console.clear.output':'Clear output',
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=1399268&r1=1399267&r2=1399268&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
Wed Oct 17 13:56:15 2012
@@ -26,21 +26,23 @@ TOMEE.ApplicationView = function () {
},
selected = null,
container = $(TOMEE.ApplicationTemplates.getValue('application', {})),
- connectionPopup =
$(TOMEE.ApplicationTemplates.getValue('application-disconnected-popup', {})),
toolbar = TOMEE.ApplicationToolbarView(),
myWindow = $(window),
- delayedContainerResize = TOMEE.DelayedTask();
+ delayedContainerResize = TOMEE.DelayedTask(),
+ connectionPopupVisible = false,
+ applicationDisabled =
$(TOMEE.ApplicationTemplates.getValue('application-disabled', {})),
+ connectionPopup =
$(TOMEE.ApplicationTemplates.getValue('application-disconnected-popup', {}));
channel.bind('server-connection', 'socket-connection-opened', function
(data) {
-
+ hideConnectionPopup();
});
channel.bind('server-connection', 'socket-connection-closed', function
(data) {
-
+ showConnectionPopup();
});
channel.bind('server-connection', 'socket-connection-error', function
(data) {
-
+ showConnectionPopup();
});
channel.bind('ui-actions', 'toolbar-click', function (data) {
@@ -93,6 +95,25 @@ TOMEE.ApplicationView = function () {
ev.preventDefault();
});
+
+ function showConnectionPopup() {
+ if (connectionPopupVisible) {
+ return;
+ }
+ connectionPopupVisible = true;
+ container.append(applicationDisabled);
+ container.append(connectionPopup);
+ }
+
+ function hideConnectionPopup() {
+ if (!connectionPopupVisible) {
+ return;
+ }
+ connectionPopupVisible = false;
+ applicationDisabled.detach();
+ connectionPopup.detach();
+ }
+
function switchPanel(key) {
if (selected) {
selected.getEl().detach();
@@ -128,8 +149,12 @@ TOMEE.ApplicationView = function () {
container.append(toolbar.getEl());
myBody.append(container);
+
switchPanel('console');
- updateContainerSize();
+
+ showConnectionPopup();
+
+ delayedContainerResize.delay(updateContainerSize, 500);
}
};
};
\ No newline at end of file
