Author: dmorozov Date: 2007-06-12 03:26:32 -0400 (Tue, 12 Jun 2007) New Revision: 1131 Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/Box.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/InlineBox.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/ScrollableBox.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/Substrate.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/utils/CustomEvent.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridFooter.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/layouts/LayoutManager.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/layouts/VLayoutManager.js trunk/sandbox/scrollable-grid/src/main/javascript/common/prototype/ext/extend.js Log: Fix problem with multiple js file including collisions Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/Box.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/Box.js 2007-06-11 18:31:30 UTC (rev 1130) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/Box.js 2007-06-12 07:26:32 UTC (rev 1131) @@ -248,4 +248,6 @@ }); +if(!ClientUI_common_box_Box_idGenerator) { var ClientUI_common_box_Box_idGenerator = 0; +}; \ No newline at end of file Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/InlineBox.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/InlineBox.js 2007-06-11 18:31:30 UTC (rev 1130) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/InlineBox.js 2007-06-12 07:26:32 UTC (rev 1131) @@ -42,4 +42,6 @@ } }); -var ClientUI_common_box_InlineBox_idGenerator = 0; \ No newline at end of file +if(!ClientUI_common_box_InlineBox_idGenerator) { + var ClientUI_common_box_InlineBox_idGenerator = 0; +}; \ No newline at end of file Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/ScrollableBox.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/ScrollableBox.js 2007-06-11 18:31:30 UTC (rev 1130) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/ScrollableBox.js 2007-06-12 07:26:32 UTC (rev 1131) @@ -136,4 +136,4 @@ this.scrollerWidth = (wNoScroll - wScroll); return this.scrollerWidth || 0; } -}) \ No newline at end of file +}); \ No newline at end of file Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/Substrate.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/Substrate.js 2007-06-11 18:31:30 UTC (rev 1130) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/Substrate.js 2007-06-12 07:26:32 UTC (rev 1131) @@ -28,7 +28,7 @@ fakeElement.removeChild(element); } - ClientUI.common.box.InlineBox.parentClass.constructor().call(this, element, parentElement, dontUpdateStyles); + ClientUI.common.box.Substrate.parentClass.constructor().call(this, element, parentElement, dontUpdateStyles); // additional styles if(!dontUpdateStyles) { @@ -36,4 +36,6 @@ } }); -var ClientUI_common_box_Substrate_idGenerator = 0; \ No newline at end of file +if(!ClientUI_common_box_Substrate_idGenerator) { + var ClientUI_common_box_Substrate_idGenerator = 0; +}; \ No newline at end of file Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/utils/CustomEvent.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/utils/CustomEvent.js 2007-06-11 18:31:30 UTC (rev 1130) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/utils/CustomEvent.js 2007-06-12 07:26:32 UTC (rev 1131) @@ -5,6 +5,8 @@ */ ClientUILib.declarePackage("ClientUI.common.utils.CustomEvent"); +if(!ClientUI.common.utils.CustomEvent.CLASSDEF) { + ClientUI.common.utils.CustomEvent = Class.create({ CLASSDEF: { name: 'ClientUI.common.utils.CustomEvent' @@ -101,4 +103,5 @@ var ClientUI_common_utils_CustomEvent_idGenerator = 0; +}; \ No newline at end of file Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-06-11 18:31:30 UTC (rev 1130) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-06-12 07:26:32 UTC (rev 1131) @@ -191,7 +191,9 @@ setProgressCtrl: function(ctrl) { this.getBody().setProgressCtrl(ctrl); } -}) +}); +if(!ClientUI_controls_grid_Grid_idGenerator) { var ClientUI_controls_grid_Grid_idGenerator = 0; +}; Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridFooter.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2007-06-11 18:31:30 UTC (rev 1130) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridFooter.js 2007-06-12 07:26:32 UTC (rev 1131) @@ -158,4 +158,4 @@ var columns = this.grid.getHeader().getColumns(); columns[column].footerCol.width = width; } -}) +}); Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/layouts/LayoutManager.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/layouts/LayoutManager.js 2007-06-11 18:31:30 UTC (rev 1130) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/layouts/LayoutManager.js 2007-06-12 07:26:32 UTC (rev 1131) @@ -56,16 +56,4 @@ getContainer: function() { return this.container; } -}) - -/* - Vertically and horizontally centering a div that follow scrolling: - - if(navigator.appName.search(/opera/gi) != -1) { // Using Opera - _element.style.top = Math.round(((document.body.clientHeight-document.documentElement.offsetHeight)/2)-(_element.style.height/2)+document.documentElement.scrollTop)+'px'; - } - else { // Using IE / Firefox / Other - _element.style.left = Math.round((document.documentElement.clientWidth/2)-(_element.style.width/2))+"px"; - _element.style.top = Math.round((document.documentElement.clientHeight/2)-(_element.style.height/2)+document.documentElement.scrollTop)+"px"; - } - */ \ No newline at end of file +}); Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/layouts/VLayoutManager.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/layouts/VLayoutManager.js 2007-06-11 18:31:30 UTC (rev 1130) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/layouts/VLayoutManager.js 2007-06-12 07:26:32 UTC (rev 1131) @@ -95,4 +95,6 @@ } }); -var ClientUI_layouts_VLayoutManager_idGenerator = 0; \ No newline at end of file +if(!ClientUI_layouts_VLayoutManager_idGenerator) { + var ClientUI_layouts_VLayoutManager_idGenerator = 0; +}; \ No newline at end of file Modified: trunk/sandbox/scrollable-grid/src/main/javascript/common/prototype/ext/extend.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/common/prototype/ext/extend.js 2007-06-11 18:31:30 UTC (rev 1130) +++ trunk/sandbox/scrollable-grid/src/main/javascript/common/prototype/ext/extend.js 2007-06-12 07:26:32 UTC (rev 1131) @@ -12,6 +12,8 @@ // The Extend object holds all the information required to implement the // inheritance and other OO-goodness. +if(!window.Extend) { + Extend = { VERSION: 1.1, CLASSDEF: "CLASSDEF", @@ -181,6 +183,7 @@ return newval })*/ return new_class -} +}; +}; // EOF