Author: tveronezi
Date: Sat Jun 9 20:42:13 2012
New Revision: 1348501
URL: http://svn.apache.org/viewvc?rev=1348501&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* loading the rest of the loading first jndi names
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js?rev=1348501&r1=1348500&r2=1348501&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js
Sat Jun 9 20:42:13 2012
@@ -74,7 +74,7 @@ TOMEE.ApplicationViewHome = function (cf
return jndi.getEl();
},
load:function (data) {
- tree.load(data);
+ tree.load(data.parentEl, data.names);
}
};
})();
@@ -237,9 +237,7 @@ TOMEE.ApplicationViewHome = function (cf
return {
loadJndi:function (data) {
- if (data) {
- jndiPanel.load(data.names);
- }
+ jndiPanel.load(data);
},
loadSavedObjects:function (data) {
savedPanel.load(data);
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js?rev=1348501&r1=1348500&r2=1348501&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Tree.js
Sat Jun 9 20:42:13 2012
@@ -21,8 +21,6 @@ TOMEE.components.Tree = function (cfg) {
var channel = cfg.channel;
- var currentData = null;
-
var getText = cfg.getText;
var childrenPropertyName = cfg.childrenPropertyName;
var myKey = cfg.key;
@@ -113,9 +111,13 @@ TOMEE.components.Tree = function (cfg) {
return elements.container;
},
- load:function (newData) {
- currentData = TOMEE.utils.getArray(newData);
- loadTree(elements.ul, currentData);
+ load:function (ul, newData) {
+ if(ul) {
+ loadTree(ul, newData);
+ } else {
+ loadTree(elements.ul, newData);
+ }
+
}
};
};
\ No newline at end of file
