Author: tveronezi
Date: Wed Jun 6 00:03:50 2012
New Revision: 1346678
URL: http://svn.apache.org/viewvc?rev=1346678&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-205
preparing menu navigation
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js?rev=1346678&r1=1346677&r2=1346678&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
Wed Jun 6 00:03:50 2012
@@ -117,19 +117,26 @@ TOMEE.ApplicationController = function (
var view = TOMEE.ApplicationView({
channel:channel,
- groups: {
- 'home': homeView,
- 'apps': {
- getEl: function() {
- return $('<div></div>')
+ groups:{
+ 'home':homeView,
+ 'apps':(function () {
+ var myEl = $('<div></div>');
+ return {
+ getEl:function () {
+ return myEl;
+ }
}
- },
- 'log': {
- getEl: function() {
- return $('<div></div>')
+ })(),
+ 'log':(function () {
+ var myEl = $('<div></div>');
+ return {
+ getEl:function () {
+ return myEl;
+ }
}
- }
- }
+ })()
+ },
+ initTab:'home'
});
return {
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js?rev=1346678&r1=1346677&r2=1346678&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
Wed Jun 6 00:03:50 2012
@@ -21,18 +21,17 @@ TOMEE.ApplicationView = function (cfg) {
var channel = cfg.channel;
var groups = cfg.groups;
+ var currentTab = TOMEE.utils.getSafe(cfg.initTab, 'home');
var toolbar = TOMEE.ApplicationToolbar({
channel:channel
});
- var currentTab = 'home';
channel.bind('toolbar.click', function (params) {
if (currentTab === params.tab) {
return;
}
- currentTab = params.tab;
- showTab(currentTab);
+ showTab(params.tab);
});
$('body').append(toolbar.getEl());
@@ -68,11 +67,17 @@ TOMEE.ApplicationView = function (cfg) {
$('body').append(elMapFooter.main);
var showTab = function(tab) {
- elMapContent.main.empty();
- elMapContent.main.append(groups[tab].getEl());
+ var showingTab = groups[currentTab].getEl();
+ showingTab.detach();
+
+ var newTab = groups[tab].getEl();
+ elMapContent.main.append(newTab);
+
+ currentTab = tab;
};
- showTab(currentTab);
+ //show current tab
+ elMapContent.main.append(groups[currentTab].getEl());
return {
setLoggedUser:function (name) {
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js?rev=1346678&r1=1346677&r2=1346678&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationViewHome.js
Wed Jun 6 00:03:50 2012
@@ -171,6 +171,5 @@ TOMEE.ApplicationViewHome = function (cf
getEl: function() {
return elMapContent.main;
}
-
};
};
\ No newline at end of file
