svn commit: r992587 - /ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml

[jl...@apache.org]

Author: jleroux
Date: Sat Sep  4 12:08:51 2010
New Revision: 992587

URL: http://svn.apache.org/viewvc?rev=992587&view=rev
Log:
As we use the jQuery branch in development of a custom project and we need all to work, I temporarily put back Prototype in the GlobalDecorator. It was needed for Dependent dropdowns mechanism but it's not the only reason, as I will soon transform this mechanism to use jQuery

It was removed at r956423 for https://issues.apache.org/jira/browse/OFBIZ-3817. It can be commented out temporarily while working on stuff where it's easier to not have it in, following Sascha's comment in OFBIZ-3817: <<I removed the prototype loading in the commons screens, the result is that the browser throws an error evertime he find JS code that's not compatible to jQuery. It's easier to find related issues.>>



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=992587&r1=992586&r2=992587&view=diff
==============================================================================
--- ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/branches/jquery/framework/common/widget/CommonScreens.xml Sat Sep  4 12:08:51 2010
@@ -130,7 +130,14 @@ under the License.
                 <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/images/GooglemapMarkers.js" global="true"/>
-                <set field="layoutSettings.javaScripts[]" value="/images/getDependentDropdownValues.js" global="true"/>
+                <set field="layoutSettings.javaScripts[]" value="/images/getDependentDropdownValues.js" global="true"/>                
+                <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/prototype.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"/>
                 <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" global="true"/>