[richfaces-svn-commits] JBoss Rich Faces SVN: r10053 - in trunk/ui: scrollableDataTable and 2 other directories.

Author: konstantin.mishin Date: 2008-08-12 10:21:17 -0400 (Tue, 12 Aug 2008) New Revision: 10053 Modified: trunk/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx trunk/ui/scrollableDataTable/generatescript.xml trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java Log: RF-4136 Modified: trunk/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx =================================================================== --- trunk/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2008-08-12 14:06:39 UTC (rev 10052) +++ trunk/ui/extendedDataTable/src/main/templates/org/richfaces/htmlExtendedDataTable.jspx 2008-08-12 14:21:17 UTC (rev 10053) @@ -38,7 +38,7 @@ /org/richfaces/renderkit/html/scripts/jquery/jquery.js, /org/richfaces/renderkit/html/script/controlUtils.js, - /org/richfaces/renderkit/html/scripts/scrollable-data-table.js, + /org/richfaces/renderkit/html/scripts/common-scrollable-data-table.js, /org/richfaces/renderkit/html/scripts/extended-data-table.js, /org/richfaces/renderkit/html/scripts/drag-indicator.js, Modified: trunk/ui/scrollableDataTable/generatescript.xml =================================================================== --- trunk/ui/scrollableDataTable/generatescript.xml 2008-08-12 14:06:39 UTC (rev 10052) +++ trunk/ui/scrollableDataTable/generatescript.xml 2008-08-12 14:21:17 UTC (rev 10053) @@ -18,8 +18,7 @@ <target name="merge-scripts-eclipse-3.3"> <property name="script-path" value="org/richfaces/renderkit/html/scripts"></property> <property name="gen-script-name" value="scrollable-data-table.js"></property> - <property name="gen-script-full-name" value="${target-dir}/${script-path}/${gen-script-name}"></property> - <concat append="false" binary="false" destfile="${gen-script-full-name}"> + <concat append="false" binary="false" destfile="${target-dir}/${script-path}/common-${gen-script-name}"> <filelist dir="${resources-dir}"> <file name="${resources-dir}/ClientUILib.js"/> <file name="${resources-dir}/ClientUI/common/utils/Utils.js"/> @@ -28,11 +27,15 @@ <file name="${resources-dir}/ClientUI/common/box/Box.js"/> <file name="${resources-dir}/ClientUI/common/box/InlineBox.js"/> <file name="${resources-dir}/ClientUI/common/box/ScrollableBox.js"/> + <file name="${resources-dir}/ClientUI/common/box/Substrate.js"/> + </filelist> + </concat> + <concat append="false" binary="false" destfile="${target-dir}/${script-path}/controls-${gen-script-name}"> + <filelist dir="${resources-dir}"> <file name="${resources-dir}/ClientUI/controls/grid/DataModel.js"/> <file name="${resources-dir}/ClientUI/controls/grid/ArrayDataModel.js"/> <file name="${resources-dir}/ClientUI/controls/grid/FakeArrayDataModel.js"/> <file name="${resources-dir}/ClientUI/layouts/LayoutManager.js"/> - <file name="${resources-dir}/ClientUI/common/box/Substrate.js"/> <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"/> @@ -50,8 +53,7 @@ <target name="merge-scripts"> <property name="script-path" value="org/richfaces/renderkit/html/scripts"></property> <property name="gen-script-name" value="scrollable-data-table.js"></property> - <property name="gen-script-full-name" value="${target-dir}/${script-path}/${gen-script-name}"></property> - <concat append="false" binary="false" destfile="${gen-script-full-name}"> + <concat append="false" binary="false" destfile="${target-dir}/${script-path}/common-${gen-script-name}"> <filelist dir="${resources-dir}"> <file name="ClientUILib.js"/> <file name="/ClientUI/common/utils/Utils.js"/> @@ -60,11 +62,15 @@ <file name="/ClientUI/common/box/Box.js"/> <file name="/ClientUI/common/box/InlineBox.js"/> <file name="/ClientUI/common/box/ScrollableBox.js"/> + <file name="/ClientUI/common/box/Substrate.js"/> + </filelist> + </concat> + <concat append="false" binary="false" destfile="${target-dir}/${script-path}/controls-${gen-script-name}"> + <filelist dir="${resources-dir}"> <file name="/ClientUI/controls/grid/DataModel.js"/> <file name="/ClientUI/controls/grid/ArrayDataModel.js"/> <file name="/ClientUI/controls/grid/FakeArrayDataModel.js"/> <file name="/ClientUI/layouts/LayoutManager.js"/> - <file name="/ClientUI/common/box/Substrate.js"/> <file name="/ClientUI/layouts/VLayoutManager.js"/> <file name="/ClientUI/layouts/GridLayoutManager.js"/> <file name="/ClientUI/controls/grid/GridHeader.js"/> 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-08-12 14:06:39 UTC (rev 10052) +++ trunk/ui/scrollableDataTable/src/main/templates/org/richfaces/scrollable-data-table.jspx 2008-08-12 14:21:17 UTC (rev 10053) @@ -19,7 +19,8 @@ <h:scripts> new org.ajax4jsf.javascript.PrototypeScript(), new org.ajax4jsf.javascript.AjaxScript(), - /org/richfaces/renderkit/html/scripts/scrollable-data-table.js + /org/richfaces/renderkit/html/scripts/common-scrollable-data-table.js, + /org/richfaces/renderkit/html/scripts/controls-scrollable-data-table.js </h:scripts> <f:clientId var="clientId" /> Modified: trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java =================================================================== --- trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java 2008-08-12 14:06:39 UTC (rev 10052) +++ trunk/ui/scrollableDataTable/src/test/java/org/richfaces/renderkit/html/ScrollableDataTableRendererTest.java 2008-08-12 14:21:17 UTC (rev 10053) @@ -34,7 +34,8 @@ javaScripts.add(AjaxScript.class.getName()); javaScripts.add(PrototypeScript.class.getName()); - javaScripts.add("org/richfaces/renderkit/html/scripts/scrollable-data-table.js"); + javaScripts.add("org/richfaces/renderkit/html/scripts/common-scrollable-data-table.js"); + javaScripts.add("org/richfaces/renderkit/html/scripts/controls-scrollable-data-table.js"); } public ScrollableDataTableRendererTest(String arg0) {