svn commit: r1400132 - in /openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js: ApplicationController.js view/panels/log.js

[tveronezi]

Author: tveronezi
Date: Fri Oct 19 15:23:39 2012
New Revision: 1400132

URL: http://svn.apache.org/viewvc?rev=1400132&view=rev
Log:
We don't need to login in order to see the log file names.

Modified:
    
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
    
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js

Modified: 
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js?rev=1400132&r1=1400131&r2=1400132&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/ApplicationController.js
 Fri Oct 19 15:23:39 2012
@@ -50,6 +50,12 @@ TOMEE.ApplicationController = function (
         });
     });
 
+    channel.bind('ui-actions', 'load-file-names', function () {
+        model.sendMessage({
+            cmdName:'GetLogFiles'
+        });
+    });
+
     channel.bind('ui-actions', 'log-file-selected', function (param) {
         model.sendMessage({
             cmdName:'GetLog',

Modified: 
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js?rev=1400132&r1=1400131&r2=1400132&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js
 Fri Oct 19 15:23:39 2012
@@ -32,7 +32,7 @@ TOMEE.ApplicationTabLog = function () {
         consoleOutput.height(outputHeight);
     });
 
-    channel.bind('server-command-callback-success', 'GetLog', function (data) {
+    channel.bind('server-command-callback-success', 'GetLogFiles', function 
(data) {
         var logFiles = container.find('.tomee-log-files');
         logFiles.empty();
 
@@ -47,19 +47,19 @@ TOMEE.ApplicationTabLog = function () {
             });
             logFiles.append(file);
         });
+    });
 
-        if (data.output.log) {
-            setFileName(data.output.log.name);
-            var lines = container.find('.tomee-log-output');
-            lines.empty();
-            
lines.append($(TOMEE.ApplicationTemplates.getValue('application-tab-log-lines', 
{
-                lines:data.output.log.lines
-            })));
-
-            lines.animate({
-                scrollTop: lines.prop("scrollHeight") - lines.height()
-            }, 500);
-        }
+    channel.bind('server-command-callback-success', 'GetLog', function (data) {
+        setFileName(data.output.log.name);
+        var lines = container.find('.tomee-log-output');
+        lines.empty();
+        
lines.append($(TOMEE.ApplicationTemplates.getValue('application-tab-log-lines', 
{
+            lines:data.output.log.lines
+        })));
+
+        lines.animate({
+            scrollTop: lines.prop("scrollHeight") - lines.height()
+        }, 500);
     });
 
     container.find('.log-file-name').on('click', function() {
@@ -95,6 +95,7 @@ TOMEE.ApplicationTabLog = function () {
         },
         onAppend:function () {
             active = true;
+            channel.send('ui-actions', 'load-file-names', {});
         },
         onDetach:function () {
             active = false;