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

[tveronezi]

Author: tveronezi
Date: Wed Jun 13 11:28:29 2012
New Revision: 1349761

URL: http://svn.apache.org/viewvc?rev=1349761&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* fixing auto height issue

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/Console.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=1349761&r1=1349760&r2=1349761&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
 Wed Jun 13 11:28:29 2012
@@ -60,7 +60,11 @@ TOMEE.ApplicationViewHome = function (cf
         channel:cfg.channel
     });
 
-    elMapContent['left'].append(jndiPanel.getEl());
+    elMapContent['left'].append((function () {
+        var wrapper = $('<div style="padding-bottom: 5px"></div>');
+        wrapper.append(jndiPanel.getEl());
+        return wrapper;
+    })());
     elMapContent['left'].append(savedPanel.getEl());
 
 
@@ -97,7 +101,19 @@ TOMEE.ApplicationViewHome = function (cf
     elMapContent['right'].append(mdbsPanel.getEl());
     elMapContent['right'].append(wsPanel.getEl());
 
+    var setHeight = function (height) {
+        var mySize = height - TOMEE.el.getBorderSize(elMapContent.main);
+        elMapContent.main.height(mySize);
+
+        var childrenSize = mySize - TOMEE.el.getBorderSize(elMapContent.left);
+        elMapContent.left.height(childrenSize);
+        elMapContent.center.height(childrenSize);
+
+        consolePanel.setHeight(childrenSize);
+    };
+
     return {
+        setHeight:setHeight,
         loadJndi:function (data) {
             jndiPanel.loadJndi(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=1349761&r1=1349760&r2=1349761&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
 Wed Jun 13 11:28:29 2012
@@ -135,6 +135,10 @@ TOMEE.components.Panel = function (cfg) 
 
         var mySize = height - toolbarSize - footerSize - 
TOMEE.el.getBorderSize(map.main) - TOMEE.el.getBorderSize(map.myBody);
         map.myBody.height(mySize);
+
+        if (cfg.onResize) {
+            cfg.onResize(mySize);
+        }
     };
 
     var getCenter = function () {

Modified: 
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js?rev=1349761&r1=1349760&r2=1349761&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/panels/Console.js
 Wed Jun 13 11:28:29 2012
@@ -25,7 +25,7 @@ TOMEE.Console = function (cfg) {
         elName:'main',
         tag:'textarea',
         attributes:{
-            style:'height: 400px; width: 100%;border: 0px;padding: 0px;margin: 
0px;'
+            style:'width: 100%;border: 0px;padding: 0px;margin: 0px;'
         }
     });
 
@@ -34,6 +34,9 @@ TOMEE.Console = function (cfg) {
         extraStyles:{
             height:'500px'
         },
+        onResize: function(height) {
+            elText.main.height(height);
+        },
         bbar:[
             {
                 elName:'scriptSelector',
@@ -79,6 +82,9 @@ TOMEE.Console = function (cfg) {
     };
 
     return {
+        setHeight:function(height) {
+            console.setHeight(height);
+        },
         getEl:function () {
             return console.getEl();
         },