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/06/15 19:21:32 UTC
svn commit: r1350705 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js:
ApplicationController.js view/tabs/ApplicationViewHome.js
Author: tveronezi
Date: Fri Jun 15 17:21:31 2012
New Revision: 1350705
URL: http://svn.apache.org/viewvc?rev=1350705&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-228
* externalizing code
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/tabs/ApplicationViewHome.js
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js?rev=1350705&r1=1350704&r2=1350705&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/ApplicationController.js Fri Jun 15 17:21:31 2012
@@ -49,10 +49,36 @@ TOMEE.ApplicationController = function (
centerPanel:deploymentsLog
});
- var homeView = TOMEE.ApplicationViewHome({
+
+ var jndiPanel = TOMEE.Jndi({
+ channel:channel
+ });
+
+ var savedPanel = TOMEE.Saved({
channel:channel
});
+ var mdbsPanel = TOMEE.MDBs({
+ channel:channel
+ });
+
+ var wsPanel = TOMEE.WebServices({
+ channel:channel
+ });
+
+ var consolePanel = TOMEE.Console({
+ channel:channel
+ });
+
+ var homeView = TOMEE.ApplicationViewHome({
+ channel:channel,
+ jndiPanel:jndiPanel,
+ savedPanel:savedPanel,
+ mdbsPanel:mdbsPanel,
+ wsPanel:wsPanel,
+ consolePanel:consolePanel
+ });
+
channel.bind('default.ajax.error.handler.triggered', function (params) {
TOMEE.ErrorPanel({
channel:channel
@@ -120,18 +146,18 @@ TOMEE.ApplicationController = function (
channel.bind('app.new.jndi.data', function (params) {
//params.path, params.bean, params.parentEl
- homeView.loadJndi(params);
+ jndiPanel.loadJndi(params);
});
channel.bind('app.new.jndi.class.data', function (params) {
//params.cls, params.name, params.path
- homeView.showJndiClassWin(params);
+ jndiPanel.showClassPanel(params);
});
channel.bind('element.right.click', function (params) {
//params.data, params.left, params.top
if (params.panelKey === 'jndi') {
- homeView.jndiContextMenu(params);
+ jndiPanel.jndiContextMenu(params);
}
});
@@ -159,7 +185,6 @@ TOMEE.ApplicationController = function (
});
-
})();
@@ -180,7 +205,7 @@ TOMEE.ApplicationController = function (
channel.bind('app.system.info', function (params) {
view.setLoggedUser(params.user);
- homeView.setSupportedScriptLanguages(params.supportedScriptLanguages);
+ consolePanel.loadScriptsField(params.supportedScriptLanguages);
});
@@ -215,7 +240,7 @@ TOMEE.ApplicationController = function (
(function () {
channel.bind('app.new.session.data', function (params) {
- homeView.loadSavedObjects(params);
+ savedPanel.load(params);
});
channel.bind('application.saved.objects.load', function (params) {
@@ -231,7 +256,7 @@ TOMEE.ApplicationController = function (
'apps':appsView,
'log':logView
},
- initTab:TOMEE.utils.getSafe(function() {
+ initTab:TOMEE.utils.getSafe(function () {
return model.getUrlVars().initTab;
}, 'home')
});
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/tabs/ApplicationViewHome.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/tabs/ApplicationViewHome.js?rev=1350705&r1=1350704&r2=1350705&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/tabs/ApplicationViewHome.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/tabs/ApplicationViewHome.js Fri Jun 15 17:21:31 2012
@@ -21,6 +21,12 @@ TOMEE.ApplicationViewHome = function (cf
var channel = cfg.channel;
+ var jndiPanel = cfg.jndiPanel;
+ var savedPanel = cfg.savedPanel;
+ var mdbsPanel = cfg.mdbsPanel;
+ var wsPanel = cfg.wsPanel;
+ var consolePanel = cfg.consolePanel;
+
var elMapContent = TOMEE.el.getElMap({
elName:'main',
tag:'div',
@@ -52,14 +58,6 @@ TOMEE.ApplicationViewHome = function (cf
]
});
- var jndiPanel = TOMEE.Jndi({
- channel:cfg.channel
- });
-
- var savedPanel = TOMEE.Saved({
- channel:cfg.channel
- });
-
elMapContent['left'].append((function () {
var wrapper = $('<div style="padding-bottom: 5px"></div>');
wrapper.append(jndiPanel.getEl());
@@ -68,20 +66,8 @@ TOMEE.ApplicationViewHome = function (cf
elMapContent['left'].append(savedPanel.getEl());
- var consolePanel = TOMEE.Console({
- channel:cfg.channel
- });
-
elMapContent['center'].append(consolePanel.getEl());
- var mdbsPanel = TOMEE.MDBs({
- channel:cfg.channel
- });
-
- var wsPanel = TOMEE.WebServices({
- channel:cfg.channel
- });
-
elMapContent['right'].append(mdbsPanel.getEl());
elMapContent['right'].append(wsPanel.getEl());
@@ -98,16 +84,9 @@ TOMEE.ApplicationViewHome = function (cf
return {
setHeight:setHeight,
- loadJndi:function (data) {
- jndiPanel.loadJndi(data);
- },
- loadSavedObjects:function (data) {
- savedPanel.load(data);
- },
getEl:function () {
return elMapContent.main;
},
- setSupportedScriptLanguages:consolePanel.loadScriptsField,
setTomeeVersion:function (myTomee) {
mdbsPanel.getEl().detach();
@@ -134,13 +113,6 @@ TOMEE.ApplicationViewHome = function (cf
}
*/
- },
- jndiContextMenu:function (opts) {
- jndiPanel.jndiContextMenu(opts);
- },
- showJndiClassWin:function (opts) {
- //opts.cls, opts.name, opts.path
- jndiPanel.showClassPanel(opts);
}
};
}