Author: tveronezi
Date: Wed Jun 13 10:55:37 2012
New Revision: 1349749
URL: http://svn.apache.org/viewvc?rev=1349749&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* fixing auto height issue
* add setTitle feature
* the log window now uses the Panel object (consistency)
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewLog.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/view/ApplicationViewLog.js
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewLog.js?rev=1349749&r1=1349748&r2=1349749&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewLog.js
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/application/js/view/ApplicationViewLog.js
Wed Jun 13 10:55:37 2012
@@ -21,86 +21,36 @@ TOMEE.ApplicationViewLog = function (cfg
var channel = cfg.channel;
- var elMapContent = TOMEE.el.getElMap({
- elName:'main',
- tag:'div'
- });
-
- var lines = (function () {
- var innerPanel = $('<div style="height: 250px; position: relative;
overflow: auto;"></div>');
-
- return {
- getEl:function () {
- return innerPanel;
- },
- load:function (data) {
- innerPanel.empty();
-
- var newData = $('<div></div>');
- for (var i = 0; i < data.length; i++) {
- newData.append(data[i]);
- newData.append('<br/>');
+ var panel = TOMEE.components.Panel({
+ title:'-',
+ bbar:[
+ {
+ elName:'fileSelector',
+ tag:'select',
+ attributes:{
+ style:'margin-right: 2px;'
}
-
- innerPanel.append(newData);
- //innerPanel.scrollTop(newData.height());
- innerPanel.animate({
- scrollTop: newData.height()
- }, 500);
- }
- }
- })();
-
- var elBottomBar = TOMEE.el.getElMap({
- elName:'main',
- tag:'form',
- cls:'well form-inline',
- attributes:{
- style:'height: 27px;margin-bottom: 0px;padding-top:
1px;padding-left: 1px;padding-bottom: 1px;padding-right: 1px;'
- },
- children:[
+ },
{
- tag:'div',
- cls:'pull-right',
- children:[
- {
- elName:'fileSelector',
- tag:'select',
- attributes:{
- style:'margin-right: 2px;'
- }
- },
- {
- elName:'loadBtn',
- tag:'button',
- cls:'btn',
- html:TOMEE.I18N.get('application.log.load')
+ elName:'loadBtn',
+ tag:'button',
+ cls:'btn',
+ html:TOMEE.I18N.get('application.log.load'),
+ listeners:{
+ 'click':function () {
+ var file = panel.getElement('fileSelector').val();
+ var tail = 100; //TODO
+ channel.send('trigger.log.load', {
+ file:file,
+ tail:tail
+ });
+ panel.setTitle(file);
}
- ]
+ }
}
]
});
- elBottomBar.loadBtn.bind('click', function () {
- var file = elBottomBar.fileSelector.val();
- var tail = 100; //TODO
- channel.send('trigger.log.load', {
- file:file,
- tail:tail
- });
- });
-
- elMapContent.main.append(lines.getEl());
- elMapContent.main.append(elBottomBar.main);
-
- var setHeight = function (height) {
- var mySize = height - TOMEE.el.getBorderSize(elMapContent.main);
- var gridSize = mySize - elBottomBar.main.outerHeight(true);
-
- elMapContent.main.height(mySize);
- lines.getEl().height(gridSize);
- };
-
var loadFilesField = function (files) {
var getOption = function (fileName) {
var option = $('<option></option>');
@@ -109,7 +59,7 @@ TOMEE.ApplicationViewLog = function (cfg
return option;
};
- var selector = elBottomBar.fileSelector;
+ var selector = panel.getElement('fileSelector');
selector.empty();
if (!files) {
return;
@@ -120,11 +70,27 @@ TOMEE.ApplicationViewLog = function (cfg
};
var loadLogTable = function (data) {
- if (!data) {
+ if (!data || !data.lines) {
return;
}
- lines.load(data.lines);
- elBottomBar.fileSelector.val(data.name);
+
+ (function (lines) {
+ panel.getContentEl().empty();
+
+ var newData = $('<div></div>');
+ for (var i = 0; i < lines.length; i++) {
+ newData.append(lines[i]);
+ newData.append('<br/>');
+ }
+
+ panel.getContentEl().append(newData);
+ //innerPanel.scrollTop(newData.height());
+ panel.getContentEl().animate({
+ scrollTop:newData.height()
+ }, 500);
+ })(data.lines);
+
+ panel.getElement('fileSelector').val(data.name);
};
var loadData = function (data) {
@@ -132,12 +98,19 @@ TOMEE.ApplicationViewLog = function (cfg
loadLogTable(data.log);
};
+ var wrapper = $('<div style="margin: 5px"></div>')
+ wrapper.append(panel.getEl());
+
return {
getEl:function () {
- return elMapContent.main;
+ return wrapper;
+ },
+ setHeight:function (height) {
+ wrapper.height(height);
+ var innerSize = height - TOMEE.el.getBorderSize(wrapper);
+ panel.setHeight(innerSize);
},
- setHeight:setHeight,
loadData:loadData
};
};
\ 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=1349749&r1=1349748&r2=1349749&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 10:55:37 2012
@@ -33,9 +33,6 @@ TOMEE.components.Panel = function (cfg)
elName:'main',
tag:'div',
cls:'t-panel',
- attributes: {
- height: '500px'
- },
children:[
{
elName:'header',
@@ -54,7 +51,7 @@ TOMEE.components.Panel = function (cfg)
tag:'div',
cls:'modal-body',
attributes:{
- style:'padding: 0px;'
+ style:'padding: 0px; max-height: 2000px;'
}
}
]
@@ -127,14 +124,16 @@ TOMEE.components.Panel = function (cfg)
}
var setHeight = function (height) {
+ map.main.height(height);
+
var toolbarSize = TOMEE.utils.getSafe(function () {
- return map.header.height();
+ return map.header.outerHeight();
}, 0);
var footerSize = TOMEE.utils.getSafe(function () {
- return map.footer.height();
+ return map.footer.outerHeight();
}, 0);
- var mySize = height - toolbarSize - TOMEE.el.getBorderSize(map.main) -
TOMEE.el.getBorderSize(map.myBody);
+ var mySize = height - toolbarSize - footerSize -
TOMEE.el.getBorderSize(map.main) - TOMEE.el.getBorderSize(map.myBody);
map.myBody.height(mySize);
};
@@ -152,6 +151,9 @@ TOMEE.components.Panel = function (cfg)
};
return {
+ setTitle:function (title) {
+ map['appName'].html(title);
+ },
getElement:function (key) {
return elementsPointers[key];
},
