Author: sascharodekamp
Date: Mon Apr 4 08:36:05 2011
New Revision: 1088502
URL: http://svn.apache.org/viewvc?rev=1088502&view=rev
Log:
Update - Update to jQuery Version 1.5.2, the new version fixes some bugs in the library.
Added:
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.5.2.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.5.2.min.js (with props)
Removed:
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.5.1.js
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.5.1.min.js
Modified:
ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl
ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl
ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
ofbiz/trunk/framework/common/widget/CommonScreens.xml
ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl
ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml
Modified: ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentScreens.xml?rev=1088502&r1=1088501&r2=1088502&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Mon Apr 4 08:36:05
2011
@@ -82,7 +82,7 @@ under the License.
<screen name="navigateContent">
<section>
<actions>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.min.js"
global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js"
global="true"/>
<set field="titleProperty" value="PageTitleNavigateContent"/>
<set field="tabButtonItem" value="navigateContent"/>
<set field="labelTitleProperty" value="PageTitleNavigateContent"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1088502&r1=1088501&r2=1088502&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Mon Apr 4 08:36:05
2011
@@ -43,7 +43,7 @@ under the License.
<set field="applicationTitle" value="${uiLabelMap.ProductCatalogManagerApplication}"
global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/external/jquery.cookie.js"
global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/jsTree/jquery.jstree.js"
global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.min.js"
global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.2.min.js"
global="true"/>
</actions>
<widgets>
<include-screen name="ApplicationDecorator" location="component://commonext/widget/CommonScreens.xml"/>
@@ -379,7 +379,7 @@ under the License.
</decorator-screen>
</widgets>
</section>
- </screen>
+ </screen>
<screen name="ImageManagementDecorator">
<section>
Modified: ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl?rev=1088502&r1=1088501&r2=1088502&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl Mon Apr 4 08:36:05
2011
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.1.min.js</@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.2.min.js</@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script>
<div id="${chartId}Div" style="width:600px;height:300px;"></div>
Modified: ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl?rev=1088502&r1=1088501&r2=1088502&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl Mon Apr 4 08:36:05
2011
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.1.min.js</@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.2.min.js</@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.pie.js</@ofbizContentUrl>"></script>
Modified: ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl?rev=1088502&r1=1088501&r2=1088502&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Mon Apr 4 08:36:05 2011
@@ -27,7 +27,7 @@ under the License.
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>${title?if_exists}</title>
- <script language="javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.1.min.js</@ofbizContentUrl>"
type="text/javascript"></script>
+ <script language="javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.2.min.js</@ofbizContentUrl>"
type="text/javascript"></script>
<script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>"
type="text/javascript"></script>
<#if layoutSettings.javaScripts?has_content>
<#--layoutSettings.javaScripts is a list of java scripts. -->
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1088502&r1=1088501&r2=1088502&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Mon Apr 4 08:36:05 2011
@@ -127,7 +127,7 @@ under the License.
<set field="layoutSettings.javaScripts[+0]" value="${localeJsFile}" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.min.js"
global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.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"/>
@@ -275,8 +275,8 @@ under the License.
</service>
<set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}"
global="true"/>
- <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js"
global="true"/>
-
+ <set field="layoutSettings.javaScripts[]" value="/images/fieldlookup.js"
global="true"/>
+
<set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]"
default-value="component://common/webcommon/includes/messages.ftl"/>
</actions>
<widgets>
@@ -356,7 +356,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="${groovy:parameters?.userLogin?.lastLocale?.substring(0,2)}"
default-value="${groovy:locale.toString()?.substring(0,2)?:'en'}"/>
<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.5.1.min.js"
global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.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"/>
Modified: ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl?rev=1088502&r1=1088501&r2=1088502&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl (original)
+++ ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl Mon Apr 4 08:36:05 2011
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/excanvas.min.js</@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.1.min.js</@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.5.2.min.js</@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.js</@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/flot/jquery.flot.pie.js</@ofbizContentUrl>"></script>
|