Author: jleroux Date: Sun Oct 10 18:02:02 2010 New Revision: 1006327 URL: http://svn.apache.org/viewvc?rev=1006327&view=rev Log: Removes (comment out for now) Prototype temporarily re-added to avoid issues while working with jQuery Branch. It's better a this stage, as Sascha done before, to remove Prototype and fix errors when they comes.
To completly remove Dojo we wait jstree to be released (http://www.jstree.com/) still 1.0rc2... I also forgot to commit the jquery-1.4.2.min.js (from jquery-1.4.2.js) because I had those Prototype changes pending Modified: ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml Modified: ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml?rev=1006327&r1=1006326&r2=1006327&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml Sun Oct 10 18:02:02 2010 @@ -124,7 +124,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/> <set field="initialLocale" type="String" value="${parameters.userLogin.lastLocale}" default-value="${groovy:locale.toString()}"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/i18n/jquery.ui.datepicker-${initialLocale}.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.2.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.2.min.js" global="true"/> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/> @@ -136,9 +136,9 @@ under the License. <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/> <!-- Prototype temporarily re-added to avoid issues while working with jQuery Branch--> - <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/scriptaculous.js" global="true"/> + <!--set field="layoutSettings.javaScripts[]" value="/images/prototypejs/scriptaculous.js" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/> - <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/resize.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/resize.js" global="true"/--> <set field="layoutSettings.commonHeaderImageLinkUrl" from-field="layoutSettings.commonHeaderImageLinkUrl" default-value="main" global="true"/>
