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/01 03:12:51 UTC
svn commit: r1344957 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp:
js/tomee/view/ApplicationView.js js/tomee/view/body.html
js/tomee/view/components/Table.js staging_index.html
Author: tveronezi
Date: Fri Jun 1 01:12:51 2012
New Revision: 1344957
URL: http://svn.apache.org/viewvc?rev=1344957&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-205
preparing the "table" component.
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Table.js
- copied, changed from r1344895, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Tree.js
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging_index.html
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js?rev=1344957&r1=1344956&r2=1344957&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js Fri Jun 1 01:12:51 2012
@@ -26,11 +26,13 @@ TOMEE.ApplicationView = function (cfg) {
dataType:'text'
}).success(function (data, textStatus, jqXHR) {
var jndi_tree_div_id = TOMEE.Sequence.next();
+ var saved_objs_div_id = TOMEE.Sequence.next();
$('body').append(TOMEE.utils.stringFormat(data, {
'app_name':TOMEE.I18N.get('application.name'),
'footer':TOMEE.I18N.get('application.footer'),
- 'jndi_tree_div_id': jndi_tree_div_id
+ 'jndi_tree_div_id': jndi_tree_div_id,
+ 'saved_objs_div_id': saved_objs_div_id
}));
var tree = TOMEE.components.Tree({
@@ -43,32 +45,11 @@ TOMEE.ApplicationView = function (cfg) {
tree.load([
{ text: TOMEE.Sequence.next(), children: [] },
{ text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
{ text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
{ text: TOMEE.Sequence.next() },
- { text: TOMEE.Sequence.next(), children: [] },
{ text: TOMEE.Sequence.next() },
{ text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() },
{ text: TOMEE.Sequence.next(), children: [] },
- { text: TOMEE.Sequence.next() },
{ text: TOMEE.Sequence.next(), children: [] },
{ text: TOMEE.Sequence.next() }
], function(data) {
@@ -77,6 +58,63 @@ TOMEE.ApplicationView = function (cfg) {
return data.children;
});
+
+ var table = TOMEE.components.Table({
+ channel: channel,
+ columns: ['colA', 'colB']
+ });
+
+ var tableEl = table.getEl();
+ $('#' + saved_objs_div_id).append(tableEl);
+
+ table.load([
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') },
+ { name: TOMEE.Sequence.next('name'), value: TOMEE.Sequence.next('value') }
+
+ ], function(bean) {
+ return [bean.name, bean.value];
+ });
+
+
+
var a = 0;
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html?rev=1344957&r1=1344956&r2=1344957&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/body.html Fri Jun 1 01:12:51 2012
@@ -44,7 +44,7 @@
<div class="well t-panel">
<h3 class="t-panel-title">Saved Objects</h3>
- <div style="height: 250px">grid here</div>
+ <div id="{saved_objs_div_id}" style="height: 250px; position: relative; overflow: auto;"></div>
</div>
</div>
</div>
Copied: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Table.js (from r1344895, openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Tree.js)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Table.js?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Table.js&p1=openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Tree.js&r1=1344895&r2=1344957&rev=1344957&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Tree.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/components/Table.js Fri Jun 1 01:12:51 2012
@@ -16,45 +16,80 @@
* limitations under the License.
*/
-TOMEE.components.Tree = function (cfg) {
+TOMEE.components.Table = function (cfg) {
"use strict";
var channel = cfg.channel;
- var elements = (function() {
+ var elements = (function () {
var container = $('<div></div>');
- var ul = $('<ul></ul>');
- ul.addClass('tree');
- container.append(ul);
+ var table = $('<table></table>');
+ table.addClass('table');
+ table.addClass('table-striped');
+ table.addClass('table-bordered');
+ table.addClass('table-condensed');
+
+ var headerLine = (function () {
+ var tr = $('<tr></tr>');
+ var thead = $('<thead></thead>');
+
+ thead.append(tr);
+ table.append(thead);
+
+ return tr;
+ })();
+
+ var createTd = function(colData) {
+ var td = $('<td></td>');
+ td.append(colData);
+ return td;
+ };
+ var myColumns = TOMEE.utils.getArray(cfg.columns);
+ for(var i = 0; i < myColumns.length; i++) {
+ headerLine.append(createTd(myColumns[i]));
+ }
+
+ var body = $('<tbody></tbody>');
+ table.append(body);
+
+ container.append(table);
return {
- container: container,
- ul: ul
+ container:container,
+ headerLine:headerLine,
+ body:body
};
})();
- var load = function (parent, data, getText, getChildren) {
- if($.isArray(data)) {
- for(var i = 0; i < data.length; i++) {
- load(parent, data[i], getText, getChildren);
- }
+ var createRow = function (rowData) {
+ var row = $('<tr></tr>');
+
+ var column = null;
+ for (var i = 0; i < rowData.length; i++) {
+ column = $('<td></td>');
+ column.append(rowData[i]);
- return;
+ row.append(column);
}
- var children = getChildren(data);
+ return row;
+ };
- var li = $('<li></li>');
- li.append(getText(data));
- if(children) {
- li.addClass('closed');
- } else {
- li.addClass('leaf');
+
+ var load = function (data, getRowData) {
+ elements.body.empty();
+
+ var loadData = TOMEE.utils.getArray(data);
+
+ for (var i = 0; i < loadData.length; i++) {
+ elements.body.append(
+ createRow(
+ TOMEE.utils.getArray(getRowData(loadData[i]))
+ )
+ );
}
- parent.append(li);
- var a = 0;
};
return {
@@ -62,14 +97,6 @@ TOMEE.components.Tree = function (cfg) {
return elements.container;
},
- load:function(data, getText, getChildren) {
- var loadData = data;
- if(!$.isArray(loadData)) {
- loadData = [loadData];
- }
-
- elements.ul.empty();
- load(elements.ul, loadData, getText, getChildren);
- }
+ load:load
};
};
\ No newline at end of file
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging_index.html
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging_index.html?rev=1344957&r1=1344956&r2=1344957&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging_index.html (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging_index.html Fri Jun 1 01:12:51 2012
@@ -25,6 +25,7 @@
<script src="js/tomee/view/components/Base.js"></script>
<script src="js/tomee/view/components/Tree.js"></script>
+<script src="js/tomee/view/components/Table.js"></script>
<script src="js/tomee/view/ApplicationView.js"></script>