svn commit: r1351605 [1/3] - in /ofbiz/trunk: framework/common/webcommon/inc
Locked
svn commit: r1351605 [1/3] - in /ofbiz/trunk: framework/common/webcommon/inc
 
|
Author: sascharodekamp
Date: Tue Jun 19 08:49:53 2012 New Revision: 1351605 URL: http://svn.apache.org/viewvc?rev=1351605&view=rev Log: Upgrade jQuery lib to 1.7.2 Added: ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.7.2.js (with props) ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.7.2.min.js (with props) 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=1351605&r1=1351604&r2=1351605&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Bars.ftl Tue Jun 19 08:49:53 2012 @@ -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.7.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.7.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=1351605&r1=1351604&r2=1351605&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/flotCharts/Pie.ftl Tue Jun 19 08:49:53 2012 @@ -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.7.min.js</@ofbizContentUrl>"></script> +<script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/jquery-1.7.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=1351605&r1=1351604&r2=1351605&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/lookup.ftl Tue Jun 19 08:49:53 2012 @@ -34,12 +34,12 @@ under the License. if (typeof(jQuery) == 'undefined') { if (!jQueryLibLoaded) { jQueryLibLoaded = true; - document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@ofbizContentUrl>/images/jquery/jquery-1.7.min.js</@ofbizContentUrl>\"></scr" + "ipt>"); + document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@ofbizContentUrl>/images/jquery/jquery-1.7.2.min.js</@ofbizContentUrl>\"></scr" + "ipt>"); } setTimeout("initJQuery()", 50); } } - initJQuery(); + initJQuery(); //]]></script> <script language="javascript" src="<@ofbizContentUrl>/images/selectall.js</@ofbizContentUrl>" type="text/javascript"></script> <#if layoutSettings.javaScripts?has_content> Modified: ofbiz/trunk/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/CommonScreens.xml?rev=1351605&r1=1351604&r2=1351605&view=diff ============================================================================== --- ofbiz/trunk/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/trunk/framework/common/widget/CommonScreens.xml Tue Jun 19 08:49:53 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.7.min.js" global="true" /> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.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.styleSheets[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css" global="true" /> @@ -185,7 +185,7 @@ under the License. <set field="appbarOpenTemplateLocation" from-field="layoutSettings.VT_NAV_OPEN_TMPLT[0]" /> <set field="appbarCloseTemplateLocation" from-field="layoutSettings.VT_NAV_CLOSE_TMPLT[0]" /> <set field="messagesTemplateLocation" from-field="layoutSettings.VT_MSG_TMPLT_LOC[0]" /> - <set field="layoutSettings.suppressTab" value="ofbizsetup"/><!-- diseable ofbiz setup by default --> + <set field="layoutSettings.suppressTab" value="ofbizsetup"/><!-- diseable ofbiz setup by default --> </actions> <widgets /> </section> @@ -478,7 +478,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.7.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.7.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.styleSheets[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-0.9.6.css" global="true"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |