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/12 23:02:36 UTC
svn commit: r1349525 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js:
util/I18N.js view/components/Panel.js view/panels/JndiClass.js
Author: tveronezi
Date: Tue Jun 12 21:02:36 2012
New Revision: 1349525
URL: http://svn.apache.org/viewvc?rev=1349525&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* add close btn
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/I18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/JndiClass.js
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/I18N.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/I18N.js?rev=1349525&r1=1349524&r2=1349525&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/I18N.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/I18N.js Tue Jun 12 21:02:36 2012
@@ -37,6 +37,7 @@ TOMEE.I18N = (function () {
'application.jdni':'Jndi',
'application.jdni.lookup':'Lookup',
'application.jdni.class': 'Jndi Class',
+ 'application.jdni.class.close': 'Close',
'application.saved.objects':'Saved Objects',
'application.saved.objects.load':'Load',
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js?rev=1349525&r1=1349524&r2=1349525&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js Tue Jun 12 21:02:36 2012
@@ -175,43 +175,48 @@ TOMEE.components.Panel = function (cfg)
}
- var map = TOMEE.el.getElMap({
- elName:'main',
- tag:'div',
- children:[
- {
- tag:'div',
- children:[
- {
- elName:'elements',
- tag:'div',
- cls:'well t-panel',
- children:[
- {
- elName:'toolbar',
- tag:'div',
- attributes:{
- style:'position: relative;'
- }
- },
- {
- elName:'content',
- tag:'div',
- attributes:{
- style:'height: 250px; position: relative; overflow: auto;'
+ var map = null;
+ var createMap = function () {
+ map = null;
+ map = TOMEE.el.getElMap({
+ elName:'main',
+ tag:'div',
+ children:[
+ {
+ tag:'div',
+ children:[
+ {
+ elName:'elements',
+ tag:'div',
+ cls:'well t-panel',
+ children:[
+ {
+ elName:'toolbar',
+ tag:'div',
+ attributes:{
+ style:'position: relative;'
+ }
},
- createCallback:function (el) {
- if (avoidOverflow) {
- el.css('overflow', '');
+ {
+ elName:'content',
+ tag:'div',
+ attributes:{
+ style:'height: 250px; position: relative; overflow: auto;'
+ },
+ createCallback:function (el) {
+ if (avoidOverflow) {
+ el.css('overflow', '');
+ }
}
}
- }
- ]
- }
- ]
- }
- ]
- });
+ ]
+ }
+ ]
+ }
+ ]
+ });
+ };
+ createMap();
if (elBottomBar) {
map.elements.append(elBottomBar.main);
@@ -285,6 +290,18 @@ TOMEE.components.Panel = function (cfg)
if (config.modal) {
//TODO: add the modal feature
}
+ },
+ close:function (killIt) {
+ if (killIt) {
+ if(map && map.main) {
+ map.main.remove();
+ }
+ createMap();
+ } else {
+ if(map && map.main) {
+ map.main.detach();
+ }
+ }
}
};
};
\ No newline at end of file
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/JndiClass.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/JndiClass.js?rev=1349525&r1=1349524&r2=1349525&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/JndiClass.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/JndiClass.js Tue Jun 12 21:02:36 2012
@@ -40,7 +40,21 @@ TOMEE.JndiClass = function (cfg) {
elName:'loadBtn',
tag:'button',
cls:'btn',
- html:TOMEE.I18N.get('application.jdni.lookup')
+ html:TOMEE.I18N.get('application.jdni.lookup'),
+ attributes:{
+ 'type':'text',
+ style:'margin-right: 2px;'
+ }
+ },
+ {
+ tag:'button',
+ cls:'btn',
+ html:TOMEE.I18N.get('application.jdni.class.close'),
+ listeners:{
+ 'click':function () {
+ panel.close(true);
+ }
+ }
}
]
});