You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by sa...@apache.org on 2011/03/16 18:25:15 UTC
svn commit: r1082227 - in /ofbiz/trunk: applications/content/widget/content/
applications/product/widget/catalog/ framework/common/webcommon/includes/
framework/common/webcommon/includes/flotCharts/ framework/common/widget/
framework/example/webapp/exa...
Author: sascharodekamp
Date: Wed Mar 16 17:25:15 2011
New Revision: 1082227
URL: http://svn.apache.org/viewvc?rev=1082227&view=rev
Log:
Update - Update to jQuery 1.4.4, Fix a bug in the fieldlookup.js to make it work with the new jQuery lib. This patch is to orepare the update to jQuery version 1.5.1
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/framework/images/webapp/images/fieldlookup.js
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=1082227&r1=1082226&r2=1082227&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Wed Mar 16 17:25:15 2011
@@ -82,7 +82,7 @@ under the License.
<screen name="navigateContent">
<section>
<actions>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.4.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=1082227&r1=1082226&r2=1082227&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Wed Mar 16 17:25:15 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.4.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.4.min.js" global="true"/>
<set field="layoutSettings.styleSheets[+0]" value="/images/catalog/categorytree.css" global="true"/>
</actions>
<widgets>
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=1082227&r1=1082226&r2=1082227&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl Wed Mar 16 17:25:15 2011
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@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=1082227&r1=1082226&r2=1082227&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl Wed Mar 16 17:25:15 2011
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@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=1082227&r1=1082226&r2=1082227&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Wed Mar 16 17:25:15 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="<@o...@ofbizContentUrl>" type="text/javascript"></script>
+ <script language="javascript" src="<@o...@ofbizContentUrl>" type="text/javascript"></script>
<script language="javascript" src="<@o...@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=1082227&r1=1082226&r2=1082227&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Wed Mar 16 17:25:15 2011
@@ -126,7 +126,7 @@ under the License.
<set field="localeJsFile" type="String" value="${groovy: fileNameComplete ? localeFileNameComplete : localeFileName}"/>
<set field="layoutSettings.javaScripts[+0]" value="${localeJsFile}" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.4.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"/>
@@ -355,7 +355,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.4.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.4.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=1082227&r1=1082226&r2=1082227&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl (original)
+++ ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl Wed Mar 16 17:25:15 2011
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
-<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
+<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
<script language="javascript" type="text/javascript" src="<@o...@ofbizContentUrl>"></script>
Modified: ofbiz/trunk/framework/images/webapp/images/fieldlookup.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/fieldlookup.js?rev=1082227&r1=1082226&r2=1082227&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/fieldlookup.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/fieldlookup.js Wed Mar 16 17:25:15 2011
@@ -310,7 +310,7 @@ function ConstructLookup(requestUrl, inp
GLOBAL_LOOKUP_REF.setReference(lookupId, this);
// bind click Event to Dialog button
- jQuery("#" + lookupId + "_button").live('click',
+ jQuery("#" + lookupId + "_button").click(
function (){
jQuery("#" + lookupId).dialog("open");
jQuery("#" + lookupId).dialog(dialogOpts);
Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1082227&r1=1082226&r2=1082227&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Wed Mar 16 17:25:15 2011
@@ -42,7 +42,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.4.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
@@ -251,7 +251,7 @@ under the License.
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.2.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.4.min.js" global="true"/>
<script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
Modified: ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl?rev=1082227&r1=1082226&r2=1082227&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl (original)
+++ ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl Wed Mar 16 17:25:15 2011
@@ -28,7 +28,7 @@ under the License.
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
<title>${(uiLabelMap.OfbizTitle)!"OFBiz, The Apache Open For Business Project"}</title>
<link rel="shortcut icon" href="/ofbiz/images/favicon.ico">
- <script language="javascript" src="/images/jquery/jquery-1.4.2.min.js" type="text/javascript"></script>
+ <script language="javascript" src="/images/jquery/jquery-1.4.4.min.js" type="text/javascript"></script>
<script language="javascript" src="/images/fieldlookup.js" type="text/javascript"></script>
<script language="javascript" src="/images/selectall.js" type="text/javascript"></script>
<script language="javascript" src="/ofbiz/script/search.js" type="text/javascript"></script>
Modified: ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml?rev=1082227&r1=1082226&r2=1082227&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/webpos/widget/CommonScreens.xml Wed Mar 16 17:25:15 2011
@@ -49,7 +49,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.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.4.min.js" global="true"/>
<script location="component://webpos/widget/WebPosSetup.groovy"/>