Author: tveronezi
Date: Mon Jun 11 15:29:48 2012
New Revision: 1348906
URL: http://svn.apache.org/viewvc?rev=1348906&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* center floating 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/view/ApplicationViewHome.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Menu.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=1348906&r1=1348905&r2=1348906&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 15:29:48 2012
@@ -71,6 +71,13 @@ TOMEE.el = (function () {
return {
getElMap:getElMap,
- getBorderSize:getBorderSize
+ getBorderSize:getBorderSize,
+ getLocationValue: function(value) {
+ if($.isNumeric(value)) {
+ return value + 'px';
+ } else {
+ return value;
+ }
+ }
}
})();
\ No newline at end of file
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=1348906&r1=1348905&r2=1348906&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 15:29:48 2012
@@ -26,6 +26,10 @@ TOMEE.ApplicationViewHome = function (cf
{
text:TOMEE.I18N.get('application.jdni.lookup'),
callback:function (data) {
+ var panel = TOMEE.components.Panel({
+ title:TOMEE.I18N.get('application.jdni.class')
+ });
+ panel.showAt();
}
}
]
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Menu.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Menu.js?rev=1348906&r1=1348905&r2=1348906&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Menu.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/components/Menu.js
Mon Jun 11 15:29:48 2012
@@ -71,8 +71,8 @@ TOMEE.components.Menu = function (cfg) {
showAt:function (config) {
var main = map.main;
- main.css('left', config.left + 'px');
- main.css('top', config.top + 'px');
+ main.css('left', TOMEE.el.getLocationValue(config.left));
+ main.css('top', TOMEE.el.getLocationValue(config.top));
data = config.data;
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=1348906&r1=1348905&r2=1348906&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 15:29:48 2012
@@ -22,6 +22,8 @@ TOMEE.components.Panel = function (cfg)
var channel = cfg.channel;
var avoidOverflow = TOMEE.utils.getSafe(cfg.avoidOverflow, false);
+ var windowEl = $(window);
+
var elMapToolbar = TOMEE.el.getElMap({
elName:'main',
tag:'div',
@@ -178,6 +180,22 @@ TOMEE.components.Panel = function (cfg)
map.content.height(mySize);
};
+ var getCenter = function () {
+ var winCenterX = windowEl.height() / 2;
+ var winCenterY = windowEl.width() / 2;
+
+ var panelX = map.main.height() / 2;
+ var panelY = map.main.width() / 2;
+
+ var x = winCenterX - panelX;
+ var y = winCenterY - panelY;
+
+ return {
+ left:y,
+ top:x
+ };
+ };
+
return {
getEl:function () {
return map.main;
@@ -188,12 +206,22 @@ TOMEE.components.Panel = function (cfg)
setHeight:setHeight,
showAt:function (config) {
var main = map.main;
-
- main.css('left', config.left + 'px');
- main.css('top', config.top + 'px');
+ main.css('position', 'absolute');
var myBody = $('body');
myBody.append(main);
+
+ if (config) {
+ main.css('left', TOMEE.el.getLocationValue(config.left));
+ main.css('top', TOMEE.el.getLocationValue(config.top));
+ } else {
+ var center = getCenter();
+
+ main.css('left', center.left + 'px');
+ main.css('top', center.top + 'px');
+ }
+
+
}
};
};
\ No newline at end of file
