[richfaces-svn-commits] JBoss Rich Faces SVN: r5136 - in trunk/ui/scrollableDataTable: src/main/javascript/ClientUI/common/box and 4 other directories.

Author: konstantin.mishin Date: 2008-01-04 08:56:28 -0500 (Fri, 04 Jan 2008) New Revision: 5136 Removed: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/SplashBox.js Modified: trunk/ui/scrollableDataTable/generatescript.xml trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx Log: merged scrollable-data-table with 3/1/x branch Modified: trunk/ui/scrollableDataTable/generatescript.xml =================================================================== --- trunk/ui/scrollableDataTable/generatescript.xml 2008-01-04 13:34:10 UTC (rev 5135) +++ trunk/ui/scrollableDataTable/generatescript.xml 2008-01-04 13:56:28 UTC (rev 5136) @@ -36,7 +36,6 @@ <file name="${resources-dir}/ClientUI/layouts/VLayoutManager.js"/> <file name="${resources-dir}/ClientUI/layouts/GridLayoutManager.js"/> <file name="${resources-dir}/ClientUI/controls/grid/GridHeader.js"/> - <file name="${resources-dir}/ClientUI/common/box/SplashBox.js"/> <file name="${resources-dir}/ClientUI/controls/grid/DataCash.js"/> <file name="${resources-dir}/ClientUI/controls/grid/GridBody.js"/> <file name="${resources-dir}/ClientUI/controls/grid/GridFooter.js"/> @@ -69,7 +68,6 @@ <file name="/ClientUI/layouts/VLayoutManager.js"/> <file name="/ClientUI/layouts/GridLayoutManager.js"/> <file name="/ClientUI/controls/grid/GridHeader.js"/> - <file name="/ClientUI/common/box/SplashBox.js"/> <file name="/ClientUI/controls/grid/DataCash.js"/> <file name="/ClientUI/controls/grid/GridBody.js"/> <file name="/ClientUI/controls/grid/GridFooter.js"/> Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js =================================================================== --- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js 2008-01-04 13:34:10 UTC (rev 5135) +++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/Box.js 2008-01-04 13:56:28 UTC (rev 5136) @@ -50,12 +50,6 @@ if(!dontUpdateStyles) { this.element.setStyle({overflow: 'hidden'}); this.element.setStyle({whiteSpace: 'nowrap'}); - - // if the element isn't positioned, make it relative - var position = this.element.getStyle('position'); - if(position != 'absolute' && position != 'fixed'){ - this.element.setStyle({position: 'relative'}); - } } }, Deleted: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/SplashBox.js =================================================================== --- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/SplashBox.js 2008-01-04 13:34:10 UTC (rev 5135) +++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/box/SplashBox.js 2008-01-04 13:56:28 UTC (rev 5136) @@ -1,95 +0,0 @@ -/** - * InlineBox.js Date created: 6.04.2007 - * Copyright (c) 2007 Exadel Inc. - * @author Denis Morozov <dmorozov(a)exadel.com&gt; - */ -ClientUILib.declarePackage("ClientUI.common.box.SplashBox"); - -ClientUILib.requireClass("ClientUI.common.box.Box"); -ClientUILib.requireClass("ClientUI.common.box.Substrate"); - -/** - * Base class that wrap work with inline blocks like span - */ -ClientUI.common.box.SplashBox = Class.create(ClientUI.common.box.Box, { - - initialize: function($super, text, parentElement, zIndex, supressSplash) { - $super(null, parentElement); - this.moveTo(-1000, -1000); - this.zIndex = zIndex || 500; - this.supressSplash = supressSplash || false; - this.createControl(text); - this.hide(); - }, - createControl: function(text) { - this.element.setStyle({zIndex: this.zIndex}); - this.makeAbsolute(); - - this.frame = new ClientUI.common.box.Substrate(null, this.getElement()); - this.frame.getElement().setStyle({zIndex: this.zIndex + 1}); - this.frame.getElement().setStyle({backgroundColor: "#FFFFFF"}); - this.frame.getElement().setStyle({border: "medium none"}); - this.frame.getElement().setStyle({opacity: "0"}); - this.frame.moveTo(0, 0); - this.frame.setWidth(this.getWidth()); - this.frame.setHeight(this.getHeight()); - - if(!this.supressSplash) { - this.div = new ClientUI.common.box.Box(null, this.getElement()); - this.div.getElement().setStyle({zIndex: this.zIndex + 2}); - this.div.getElement().setStyle({backgroundColor: "#000000"}); - this.div.getElement().setStyle({opacity: "0.6"}); - this.div.makeAbsolute(); - this.div.moveTo(0, 0); - this.div.setWidth(this.getWidth()); - this.div.setHeight(this.getHeight()); - this.div.show(); - } - - this.text = new ClientUI.common.box.Box(text, this.getElement()); - this.text.setParent(this.getElement()); - this.text.getElement().setStyle({zIndex: this.zIndex + 100}); - if(!text) - this.text.getElement().innerHTML = "<font size='4' color='white'>Loading...</font>"; - this.text.makeAbsolute(); - this.text.show(); - - }, - setSize: function(width, height) { - this.setWidth(width); - this.setHeight(height); - this.containerWidth = width; - this.containerHeight = height; - }, - setImage: function(image) { - if(!this.img) { - this.img = new ClientUI.common.box.Box($(document.createElement("img")), this.div.getElement()); - this.img.makeAbsolute(); - } - this.img.getElement().src = image; - this.text.hide(); - }, - updateLayout: function() { - var width = this.containerWidth||this.getWidth(); - var height = this.containerHeight||this.getHeight(); - - this.frame.setWidth(width); - this.frame.setHeight(height); - - if(!this.supressSplash) { - this.div.setWidth(width); - this.div.setHeight(height); - } - - if(this.img) { - var x = width/2 - this.img.getWidth()/2; - var y = height/2 - this.img.getHeight()/2; - this.img.moveTo(x, y); - } - else { - var x = width/2 - this.text.getWidth()/2; - var y = height/2 - this.text.getHeight()/2; - this.text.moveTo(x, y); - } - } -}); Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js =================================================================== --- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js 2008-01-04 13:34:10 UTC (rev 5135) +++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/Grid.js 2008-01-04 13:56:28 UTC (rev 5136) @@ -68,13 +68,14 @@ this.currentScrollPos = 0; this.controlCreated = true; - this.updateLayout(); - - if (ClientUILib.isIE && !ClientUILib.isIE7) { - var grid = this; - setTimeout(function() {grid.updateLayout()}, 50); - } + var grid = this; + Utils.execOnLoad( + function(){ + grid.updateLayout(); + }, + Utils.Condition.ElementPresent(grid.client_id), 100); }, + updateLayout: function($super) { if(!this.controlCreated || this.getHeight()==0) { return; Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js =================================================================== --- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2008-01-04 13:34:10 UTC (rev 5135) +++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2008-01-04 13:56:28 UTC (rev 5136) @@ -94,10 +94,8 @@ } this.contentBox = new ClientUI.common.box.Box(normal); - this.contentBox.makeAbsolute(); Event.observe(this.contentBox.getElement(), 'keypress', this.synchronizeScroll.bindAsEventListener(this)); this.frozenContentBox = new ClientUI.common.box.Box(frozen); - this.frozenContentBox.makeAbsolute(); this.helpObject1 = new ClientUI.common.box.Box(this.gridId + ":nho", this.contentBox.getElement()); this.helpObject2 = new ClientUI.common.box.Box(this.gridId + ":fho", this.frozenContentBox.getElement()); @@ -231,7 +229,7 @@ this.container.setHeight(height - fixH); this.defaultRowHeight = this._calcDefaultRowHeight(); - this.sizeBox.hide(); + this.scrollBox.hide(); this.sizeBox.setHeight(this.defaultRowHeight * this.grid.dataModel.getCount() + fixH); this.helpObject1.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5); this.helpObject2.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5); @@ -241,7 +239,7 @@ if(height > 0) { this.adjustDataPosition(this.currentPos); } - this.sizeBox.show(); + this.scrollBox.show(); var viewWidth = this.scrollBox.getViewportWidth(); this.container.setWidth(viewWidth); Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js =================================================================== --- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2008-01-04 13:34:10 UTC (rev 5135) +++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2008-01-04 13:56:28 UTC (rev 5136) @@ -67,10 +67,8 @@ throw(errMsg); } this.contentBox = new ClientUI.common.box.Box(normal); - this.contentBox.makeAbsolute(); this.frozenContentBox = new ClientUI.common.box.Box(frozen); - this.frozenContentBox.makeAbsolute(); - + // create row template var ch = this.contentBox.getElement().firstChild; while(ch) { Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js =================================================================== --- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2008-01-04 13:34:10 UTC (rev 5135) +++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2008-01-04 13:56:28 UTC (rev 5136) @@ -83,10 +83,8 @@ throw(errMsg); } this.contentBox = new ClientUI.common.box.Box(normal); - this.contentBox.makeAbsolute(); this.frozenContentBox = new ClientUI.common.box.Box(frozen); - this.frozenContentBox.makeAbsolute(); - + // create row template var ch = this.contentBox.getElement().firstChild; while(ch) { Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js =================================================================== --- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js 2008-01-04 13:34:10 UTC (rev 5135) +++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js 2008-01-04 13:56:28 UTC (rev 5136) @@ -16,39 +16,21 @@ {pane: GridLayout_Enum.BODY, ref: this.client_id +"_" + "GridBodyTemplate"}, {pane: GridLayout_Enum.FOOTER, ref: this.client_id +"_" + "GridFooterTemplate"} ]; - var grid = this; - var s = $super; - Utils.execOnLoad( - function(){ - grid.init(s); - }, - Utils.Condition.ElementPresent(grid.client_id), 100); + this.startCreateTime = (new Date()).getTime(); + + $super(this.client_id, this.dataModel, this.templates); + + this.endCreateTime = (new Date()).getTime(); + Event.observe(this.element, "grid:onsort", this.onSorted.bindAsEventListener(this)); + if (this.options.selectionInput) { + this.selectionManager = new ClientUI.controls.grid.SelectionManager(this); + } + this.getBody().restoreScrollState(); this.endInitTime = (new Date()).getTime(); this.rowCallbacks = []; }, - -// initialize parent Grid - init: function(superCtor){ - // mark that grid control initialized - if(!this.isInitialized) { - this.isInitialized = true; - this.startCreateTime = (new Date()).getTime(); - - superCtor(this.client_id, this.dataModel, this.templates); - - this.endCreateTime = (new Date()).getTime(); - - Event.observe(this.element, "grid:onsort", this.onSorted.bindAsEventListener(this)); - if (this.options.selectionInput) { - this.selectionManager = new ClientUI.controls.grid.SelectionManager(this); - } - this.element.fire("grid:initialized"); - this.getBody().restoreScrollState(); - } - }, - onSortComplete : function(request, event, data){ this.dataModel.count = $(this.client_id + "_rows_input").value; var options = request.getJSON("options"); Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js =================================================================== --- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js 2008-01-04 13:34:10 UTC (rev 5135) +++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/layouts/VLayoutManager.js 2008-01-04 13:56:28 UTC (rev 5136) @@ -23,10 +23,6 @@ ClientUI.layouts.VLayoutManager = Class.create(ClientUI.layouts.LayoutManager, { initialize: function($super, element, parentElement, config) { $super(element, parentElement); - if(!element || !element.id) { - this.element.id = "ClientUI_VLayoutManager" + ClientUI_layouts_VLayoutManager_idGenerator++; - } - this.registerEvents(); }, registerEvents: function($super) { Modified: trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss =================================================================== --- trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2008-01-04 13:34:10 UTC (rev 5135) +++ trunk/ui/scrollableDataTable/src/main/resources/org/richfaces/renderkit/html/css/scrollable-data-table.xcss 2008-01-04 13:56:28 UTC (rev 5136) @@ -229,7 +229,8 @@ .dr-sdt-tmplbox { display: block; - float:left; + float:left; + position: absolute; } .dr-sdt-inlinebox { Modified: trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx =================================================================== --- trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2008-01-04 13:34:10 UTC (rev 5135) +++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2008-01-04 13:56:28 UTC (rev 5136) @@ -85,7 +85,7 @@ </jsp:scriptlet> <tr> <td style="height: 100%;"> - <div id="#{clientId}:c" style="height: 100%;"> + <div id="#{clientId}:c" style="height: 100%; position: relative;"> <div id="#{clientId}:cs" class="dr-sdt-hsplit" style="display: none;"/> <div id="#{clientId}_GridHeaderTemplate" class="dr-sdt-inlinebox" style="#{hStyle}; width: #{component.attributes['width']};"> <iframe id="#{clientId}:hs" class="dr-sdt-substrate" src="" scrolling="no" frameborder="0" > <br/> </iframe>