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/11 23:05:25 UTC

svn commit: r1349010 - in /openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view: ApplicationViewHome.js components/Panel.js panels/Jndi.js panels/JndiClass.js

Author: tveronezi
Date: Mon Jun 11 21:05:23 2012
New Revision: 1349010

URL: http://svn.apache.org/viewvc?rev=1349010&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* define the parent of a floating panel

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/Panel.js
    openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.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/view/ApplicationViewHome.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewHome.js?rev=1349010&r1=1349009&r2=1349010&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 21:05:23 2012
@@ -53,11 +53,11 @@ TOMEE.ApplicationViewHome = function (cf
     });
 
     var jndiPanel = TOMEE.Jndi({
-       channel: cfg.channel
+        channel:cfg.channel
     });
 
     var savedPanel = TOMEE.Saved({
-        channel: cfg.channel
+        channel:cfg.channel
     });
 
     elMapContent['left'].append(jndiPanel.getEl());
@@ -65,7 +65,7 @@ TOMEE.ApplicationViewHome = function (cf
 
 
     var consolePanel = TOMEE.Console({
-        channel: cfg.channel
+        channel:cfg.channel
     });
 
     elMapContent['center'].append(consolePanel.getEl());

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=1349010&r1=1349009&r2=1349010&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 21:05:23 2012
@@ -22,7 +22,10 @@ TOMEE.components.Panel = function (cfg) 
     var channel = cfg.channel;
     var avoidOverflow = TOMEE.utils.getSafe(cfg.avoidOverflow, false);
 
-    var windowEl = $(window);
+    var parentEl = cfg.parent;
+    if(!parentEl) {
+        parentEl = $(window);
+    }
 
     var elMapToolbar = TOMEE.el.getElMap({
         elName:'main',
@@ -181,8 +184,8 @@ TOMEE.components.Panel = function (cfg) 
     };
 
     var getCenter = function () {
-        var winCenterX = windowEl.height() / 2;
-        var winCenterY = windowEl.width() / 2;
+        var winCenterX = parentEl.height() / 2;
+        var winCenterY = parentEl.width() / 2;
 
         var panelX = map.main.height() / 2;
         var panelY = map.main.width() / 2;

Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js?rev=1349010&r1=1349009&r2=1349010&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Jndi.js Mon Jun 11 21:05:23 2012
@@ -21,18 +21,7 @@ TOMEE.Jndi = function (cfg) {
 
     var channel = cfg.channel;
 
-    var jndiMenu = TOMEE.components.Menu({
-        commands:[
-            {
-                text:TOMEE.I18N.get('application.jdni.lookup'),
-                callback:function (data) {
-                    TOMEE.JndiClass({
-                        channel:channel
-                    }).show({});
-                }
-            }
-        ]
-    });
+    var parentEl = cfg.parent;
 
     var jndi = TOMEE.components.Panel({
         title:TOMEE.I18N.get('application.jdni')
@@ -50,6 +39,20 @@ TOMEE.Jndi = function (cfg) {
     var treeEl = tree.getEl();
     jndi.getContentEl().append(treeEl);
 
+    var jndiMenu = TOMEE.components.Menu({
+        commands:[
+            {
+                text:TOMEE.I18N.get('application.jdni.lookup'),
+                callback:function (data) {
+                    TOMEE.JndiClass({
+                        parent:parentEl,
+                        channel:channel
+                    }).show({});
+                }
+            }
+        ]
+    });
+
     return {
         loadJndi:function (data) {
             tree.load(data.parentEl, data.names);

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=1349010&r1=1349009&r2=1349010&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 Mon Jun 11 21:05:23 2012
@@ -23,6 +23,7 @@ TOMEE.JndiClass = function (cfg) {
 
     var panel = TOMEE.components.Panel({
         title:TOMEE.I18N.get('application.jdni.class'),
+        parent:cfg.parent,
         extraStyles:{
             width:'500px',
             height:'200px'