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 2012/10/16 15:55:24 UTC
svn commit: r1398800 [1/3] - in /ofbiz/trunk:
framework/common/webcommon/includes/
framework/common/webcommon/includes/flotCharts/ framework/common/widget/
framework/images/webapp/images/jquery/ specialpurpose/ecommerce/widget/
specialpurpose/example/w...
Author: sascharodekamp
Date: Tue Oct 16 13:55:23 2012
New Revision: 1398800
URL: http://svn.apache.org/viewvc?rev=1398800&view=rev
Log:
Upgrade jQuery to Version 1.8.2
Added:
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.8.2.js (with props)
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.8.2.min.js (with props)
Removed:
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.8.0.js
ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.8.0.min.js
Modified:
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/specialpurpose/ecommerce/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/example/webapp/example/flot/flotPie.ftl
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/header.ftl
ofbiz/trunk/specialpurpose/ofbizwebsite/template/HtmlHead.ftl
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=1398800&r1=1398799&r2=1398800&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl Tue Oct 16 13:55:23 2012
@@ -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=1398800&r1=1398799&r2=1398800&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl Tue Oct 16 13:55:23 2012
@@ -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=1398800&r1=1398799&r2=1398800&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Tue Oct 16 13:55:23 2012
@@ -34,7 +34,7 @@ under the License.
if (typeof(jQuery) == 'undefined') {
if (!jQueryLibLoaded) {
jQueryLibLoaded = true;
- document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@o...@ofbizContentUrl>\"></scr" + "ipt>");
+ document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@o...@ofbizContentUrl>\"></scr" + "ipt>");
}
setTimeout("initJQuery()", 50);
}
Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1398800&r1=1398799&r2=1398800&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Tue Oct 16 13:55:23 2012
@@ -150,7 +150,7 @@ under the License.
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true" />
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true" />
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true" />
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.0.min.js" global="true" />
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.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" />
<set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true" />
@@ -477,7 +477,7 @@ under the License.
<set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.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/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
- <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.0.min.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.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"/>