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/18 14:37:31 UTC
svn commit: r1082916 [1/6] - in /ofbiz/trunk:
applications/content/widget/content/ applications/order/email/default/
applications/party/webapp/partymgr/js/ applications/product/widget/catalog/
framework/common/webcommon/includes/ framework/common/webco...
Author: sascharodekamp
Date: Fri Mar 18 13:37:29 2011
New Revision: 1082916
URL: http://svn.apache.org/viewvc?rev=1082916&view=rev
Log:
Update - Update the jQuery library to version 1.5.1. A few changes were necessary for this step. I updated the jQuery flot library to the current release, because the old one doesn't work with the new jQuery version, i also updated the jsTree Plugin to make it work with the new jQuery Version.
Note in jQuery 1.5 the implementation of the ajax function has been changed.
For more Information have a look at: http://blog.jquery.com/2011/01/31/jquery-15-released/
Added:
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.5.1.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.5.1.min.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.resize.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/classic/d.gif (with props)
Modified:
ofbiz/trunk/applications/content/widget/content/ContentScreens.xml
ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl
ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js
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/getDependentDropdownValues.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/API.txt
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/NEWS.txt
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/PLUGINS.txt
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/README.txt
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.colorhelpers.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.crosshair.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.navigate.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.pie.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/flot/jquery.flot.selection.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/jquery.jstree.js
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/apple/style.css
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/classic/style.css
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default-rtl/style.css
ofbiz/trunk/framework/images/webapp/images/jquery/plugins/jsTree/themes/default/style.css
ofbiz/trunk/framework/images/webapp/images/myportal.js
ofbiz/trunk/framework/images/webapp/images/selectall.js
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js
ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/googlecheckout/webapp/googlecheckout/redirect/redirectHeader.ftl
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=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/content/ContentScreens.xml Fri Mar 18 13:37:29 2011
@@ -82,7 +82,7 @@ under the License.
<screen name="navigateContent">
<section>
<actions>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.4.4.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.min.js" global="true"/>
<set field="titleProperty" value="PageTitleNavigateContent"/>
<set field="tabButtonItem" value="navigateContent"/>
<set field="labelTitleProperty" value="PageTitleNavigateContent"/>
Modified: ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl (original)
+++ ofbiz/trunk/applications/order/email/default/emailprocessnotify.ftl Fri Mar 18 13:37:29 2011
@@ -19,7 +19,7 @@ under the License.
<html>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/js/PartyProfileContent.js Fri Mar 18 13:37:29 2011
@@ -90,7 +90,6 @@ function getUploadProgressStatus(event){
var timerId = timerId;
jQuery.ajax({
url: 'getFileUploadProgressStatus',
- dataType: "json",
success: function(data) {
if (data._ERROR_MESSAGE_LIST_ != undefined) {
jQuery('#content-messages').html(data._ERROR_MESSAGE_LIST_);
Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Fri Mar 18 13:37:29 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.4.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.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=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl Fri Mar 18 13:37:29 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=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl Fri Mar 18 13:37:29 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=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Fri Mar 18 13:37:29 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=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Fri Mar 18 13:37:29 2011
@@ -126,7 +126,8 @@ 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.4.min.js" global="true"/>
+
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.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 +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.4.4.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.5.1.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=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl (original)
+++ ofbiz/trunk/framework/example/webapp/example/flot/flotPie.ftl Fri Mar 18 13:37:29 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/getDependentDropdownValues.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/getDependentDropdownValues.js?rev=1082916&r1=1082915&r2=1082916&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/getDependentDropdownValues.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/getDependentDropdownValues.js Fri Mar 18 13:37:29 2011
@@ -43,7 +43,6 @@ function getDependentDropdownValues(requ
name: paramKey,
value: jQuery('#' + paramField).val()
}], // get requested value from parent drop-down field
- dataType: 'json',
async: false,
type: 'POST',
success: function(result){
@@ -117,7 +116,6 @@ function getServiceResult(request, param
data: params,
async: false,
cache: false,
- dataType: 'json',
success: function(result){
data = result;
}
@@ -125,7 +123,7 @@ function getServiceResult(request, param
return data;
}
-//*** checkUomConversion returns true if an UomConversion exists
+//*** checkUomConversion returns true if an UomConversion exists
function checkUomConversion(request, params){
data = getServiceResult(request, params);
return data['exist'];