Author: tveronezi
Date: Mon Jun 11 16:04:13 2012
New Revision: 1348923
URL: http://svn.apache.org/viewvc?rev=1348923&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* preparing "view class" panel
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js
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/ApplicationViewHome.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Panel.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js?rev=1348923&r1=1348922&r2=1348923&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/util/El.js
Mon Jun 11 16:04:13 2012
@@ -76,7 +76,7 @@ TOMEE.el = (function () {
if($.isNumeric(value)) {
return value + 'px';
} else {
- return value;
+ return TOMEE.utils.getSafe(value, '0px');
}
}
}
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=1348923&r1=1348922&r2=1348923&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
Mon Jun 11 16:04:13 2012
@@ -36,6 +36,7 @@ TOMEE.I18N = (function () {
'application.jdni':'Jndi',
'application.jdni.lookup':'Lookup',
+ 'application.jdni.class': 'Jndi Class',
'application.saved.objects':'Saved Objects',
'application.saved.objects.load':'Load',
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=1348923&r1=1348922&r2=1348923&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
Mon Jun 11 16:04:13 2012
@@ -22,18 +22,24 @@ TOMEE.ApplicationViewHome = function (cf
var channel = cfg.channel;
var jndiMenu = TOMEE.components.Menu({
- commands:[
- {
- text:TOMEE.I18N.get('application.jdni.lookup'),
- callback:function (data) {
- var panel = TOMEE.components.Panel({
- title:TOMEE.I18N.get('application.jdni.class')
- });
- panel.showAt();
+ commands:[
+ {
+ text:TOMEE.I18N.get('application.jdni.lookup'),
+ callback:function (data) {
+ var panel = TOMEE.components.Panel({
+ title:TOMEE.I18N.get('application.jdni.class'),
+ extraStyles:{
+ width:'500px',
+ height:'200px'
+ }
+ });
+ panel.showAt({
+ modal: true
+ });
+ }
}
- }
- ]
- });
+ ]
+ });
var elMapContent = TOMEE.el.getElMap({
@@ -186,7 +192,7 @@ TOMEE.ApplicationViewHome = function (cf
el.append(elText.main);
el.append(elBottomBar.main);
- elBottomBar.main.bind('click', function () {
+ elBottomBar.main.bind('executeBtn', function () {
var text = elText.main.val();
var script = elBottomBar.scriptSelector.val();
channel.send('trigger.console.exec', {
@@ -286,4 +292,5 @@ TOMEE.ApplicationViewHome = function (cf
});
}
};
-};
\ No newline at end of file
+}
+;
\ No newline at end of file
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=1348923&r1=1348922&r2=1348923&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
Mon Jun 11 16:04:13 2012
@@ -205,13 +205,17 @@ TOMEE.components.Panel = function (cfg)
},
setHeight:setHeight,
showAt:function (config) {
+ if (!config) {
+ throw 'missing parameters';
+ }
+
var main = map.main;
main.css('position', 'absolute');
var myBody = $('body');
myBody.append(main);
- if (config) {
+ if (config.left || config.top) {
main.css('left', TOMEE.el.getLocationValue(config.left));
main.css('top', TOMEE.el.getLocationValue(config.top));
} else {
@@ -221,7 +225,9 @@ TOMEE.components.Panel = function (cfg)
main.css('top', center.top + 'px');
}
-
+ if (config.modal) {
+ //TODO: add the modal feature
+ }
}
};
};
\ No newline at end of file
