You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2012/02/17 00:30:04 UTC
svn commit: r1245252 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee:
ApplicationController.js view/ApplicationHomePanelJndi.js
view/ApplicationHomePanelTest.js
Author: tveronezi
Date: Thu Feb 16 23:30:04 2012
New Revision: 1245252
URL: http://svn.apache.org/viewvc?rev=1245252&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-130
Preparing the javascript/html code for the new web interface. Once this initial code is ready, I will move the files under "staging" to a better location.
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelJndi.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelTest.js
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js?rev=1245252&r1=1245251&r2=1245252&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js Thu Feb 16 23:30:04 2012
@@ -61,10 +61,6 @@ TOMEE.ApplicationController = function (
//placeholder
});
- view.render(function () {
- view.getHome().getMenu().selectMenu('test');
- });
-
//"test" -> data loaded event
channel.bind('test_connection_exception', function (params) {
@@ -83,13 +79,12 @@ TOMEE.ApplicationController = function (
channel.bind('panel_show', function (params) {
var panel = params.panel;
- if (panel.loadData) {
- panel.loadData();
- }
+ panel.getMyModel().load();
});
- testPanelModel.load();
- jndiPanelModel.load();
+ view.render(function () {
+ view.getHome().getMenu().selectMenu('test');
+ });
return {
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelJndi.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelJndi.js?rev=1245252&r1=1245251&r2=1245252&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelJndi.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelJndi.js Thu Feb 16 23:30:04 2012
@@ -82,6 +82,9 @@ TOMEE.ApplicationHomePanelJndi = functio
getEl: function () {
return elements.all;
},
- loadData: loadData
+ loadData: loadData,
+ getMyModel: function () {
+ return model;
+ }
};
};
\ No newline at end of file
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelTest.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelTest.js?rev=1245252&r1=1245251&r2=1245252&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelTest.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanelTest.js Thu Feb 16 23:30:04 2012
@@ -84,6 +84,9 @@ TOMEE.ApplicationHomePanelTest = functio
getEl: function () {
return elements.all;
},
- loadData: loadData
+ loadData: loadData,
+ getMyModel: function () {
+ return model;
+ }
};
};
\ No newline at end of file