SAK-30827 - Update jquery-migrate to 1.4.0

brdebr · Apr 14, 2016 · da247fc · da247fc
1 parent eb9e407
commit da247fc
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/login/login-render-engine-impl/pack/src/webapp/vm/defaultskin/xlogin.vm b/login/login-render-engine-impl/pack/src/webapp/vm/defaultskin/xlogin.vm
@@ -52,7 +52,7 @@
     	    }
     	    if ( needJQuery ) {
     	        document.write('\x3Cscript src="${pageWebjarsPath}jquery/1.11.3/jquery.min.js$!{portalCDNQuery}">'+'\x3C/script>')
-    	        document.write('\x3Cscript src="${pageWebjarsPath}jquery-migrate/1.2.1/jquery-migrate.min.js$!{portalCDNQuery}">'+'\x3C/script>')
+    	        document.write('\x3Cscript src="${pageWebjarsPath}jquery-migrate/1.4.0/jquery-migrate.min.js$!{portalCDNQuery}">'+'\x3C/script>')
     	    }
     	</script>
     	<script>

diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/site.vm b/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/site.vm
@@ -78,14 +78,14 @@
         }
         if ( needJQuery ) {
             document.write('\x3Cscript src="${pageWebjarsPath}jquery/1.11.3/jquery.min.js$!{portalCDNQuery}">'+'\x3C/script>')
-            document.write('\x3Cscript src="${pageWebjarsPath}jquery-migrate/1.2.1/jquery-migrate.min.js$!{portalCDNQuery}">'+'\x3C/script>')
+            document.write('\x3Cscript src="${pageWebjarsPath}jquery-migrate/1.4.0/jquery-migrate.min.js$!{portalCDNQuery}">'+'\x3C/script>')
             document.write('\x3Cscript src="${pageWebjarsPath}bootstrap/3.3.6/js/bootstrap.min.js$!{portalCDNQuery}">'+'\x3C/script>')
             document.write('\x3Cscript src="${pageWebjarsPath}jquery-ui/1.11.3/jquery-ui.min.js$!{portalCDNQuery}">'+'\x3C/script>')
             document.write('\x3Clink rel="stylesheet" href="${pageWebjarsPath}jquery-ui/1.11.3/jquery-ui.min.css$!{portalCDNQuery}"/>')
             window.console && console.log('Portal scripts loaded JQ+MI+BS+UI');
         } else {
             if (typeof jQuery.migrateWarnings == 'undefined') {
-                document.write('\x3Cscript type="text/javascript" src="${pageWebjarsPath}jquery-migrate/1.2.1/jquery-migrate.min.js$!{portalCDNQuery}">'+'\x3C/script>')
+                document.write('\x3Cscript type="text/javascript" src="${pageWebjarsPath}jquery-migrate/1.4.0/jquery-migrate.min.js$!{portalCDNQuery}">'+'\x3C/script>')
                 window.console && console.log('Portal adding jQuery migrate');
             }
             if ( typeof jQuery.fn.popover == 'undefined') {

diff --git a/portal/portal-util/util/src/java/org/sakaiproject/portal/util/PortalUtils.java b/portal/portal-util/util/src/java/org/sakaiproject/portal/util/PortalUtils.java
@@ -105,7 +105,7 @@ public static String includeLatestJQuery(String where)
                  getWebjarsPath() + "jquery/1.11.3/jquery.min.js" + getCDNQuery() + 
                  "\">'+'\\x3C/script>')\n" +
              "   document.write('\\x3Cscript type=\"text/javascript\" src=\"" +
-                 getWebjarsPath() + "jquery-migrate/1.2.1/jquery-migrate.min.js" + getCDNQuery() + 
+                 getWebjarsPath() + "jquery-migrate/1.4.0/jquery-migrate.min.js" + getCDNQuery() + 
                  "\">'+'\\x3C/script>')\n" +
              "   document.write('\\x3Cscript type=\"text/javascript\" src=\"" +
                  getWebjarsPath() + "bootstrap/3.3.6/js/bootstrap.min.js" + getCDNQuery() + 
@@ -119,7 +119,7 @@ public static String includeLatestJQuery(String where)
              "} else { \n" +
              "   window.console && console.log('jQuery already loaded '+jQuery.fn.jquery+' in '+'" + where + "');\n" +
              "   if (typeof jQuery.migrateWarnings == 'undefined') {\n" +
-             "           document.write('\\x3Cscript type=\"text/javascript\" src=\"" + getWebjarsPath() + "jquery/jquery-migrate-1.2.1.min.js" + getCDNQuery() + "\">'+'\\x3C/script>')\n" +
+             "           document.write('\\x3Cscript type=\"text/javascript\" src=\"" + getWebjarsPath() + "jquery/jquery-migrate-1.4.0.min.js" + getCDNQuery() + "\">'+'\\x3C/script>')\n" +
              "           window.console && console.log('Adding jQuery migrate');\n" +
              "   }\n" +
              "   if ( typeof jQuery.fn.popover == 'undefined') {\n" +

diff --git a/reference/library/pom.xml b/reference/library/pom.xml
@@ -71,7 +71,7 @@
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>jquery-migrate</artifactId>
-			<version>1.2.1</version>
+			<version>1.4.0</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>

diff --git a/reference/library/src/webapp/js/fontIconPicker/2.0.1-cs/demo.html b/reference/library/src/webapp/js/fontIconPicker/2.0.1-cs/demo.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <script type="text/javascript" src="../../jquery/jquery-1.9.1.js"></script>
-<script type="text/javascript" src="../../jquery/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../jquery/1.4.0/jquery-migrate.min.js"></script>
 <script type="text/javascript" src="../...jquery/ui/1.11.3/jquery-ui.min.js?version="></script>
 <script type="text/javascript" src="../../headscripts.js"></script>
 

diff --git a/reference/library/src/webapp/js/headscripts.js b/reference/library/src/webapp/js/headscripts.js
@@ -744,7 +744,7 @@ function includeLatestJQuery(where) {
 	if ( window.jQuery ) {
 		window.console && console.log('jQuery already loaded '+jQuery.fn.jquery+' in '+where);
 		if (typeof jQuery.migrateWarnings == 'undefined') { 
-			document.write('\x3Cscript type="text/javascript" src="'+webjars+'jquery-migrate/1.2.1/jquery-migrate.min.js'+ver+'">'+'\x3C/script>')
+			document.write('\x3Cscript type="text/javascript" src="'+webjars+'jquery-migrate/1.4.0/jquery-migrate.min.js'+ver+'">'+'\x3C/script>')
 			window.console && console.log('Adding jQuery migrate');
 		}
 		if ( typeof jQuery.fn.popover == 'undefined') {
@@ -758,7 +758,7 @@ function includeLatestJQuery(where) {
 		}
 	} else {
 		document.write('\x3Cscript type="text/javascript" src="'+webjars+'jquery/1.11.3/jquery.min.js'+ver+'">'+'\x3C/script>')
-		document.write('\x3Cscript type="text/javascript" src="'+webjars+'jquery-migrate/1.2.1/jquery-migrate.min.js'+ver+'">'+'\x3C/script>')
+		document.write('\x3Cscript type="text/javascript" src="'+webjars+'jquery-migrate/1.4.0/jquery-migrate.min.js'+ver+'">'+'\x3C/script>')
 		document.write('\x3Cscript type="text/javascript" src="'+webjars+'bootstrap/3.3.6/js/bootstrap.min.js'+ver+'">'+'\x3C/script>')
 		document.write('\x3Cscript type="text/javascript" src="'+webjars+'jquery-ui/1.11.3/jquery-ui.min.js'+ver+'">'+'\x3C/script>')
 		document.write('\x3Clink rel="stylesheet" href="'+webjars+'jquery-ui/1.11.3/jquery-ui.min.css'+ver+'"/>');

diff --git a/roster2/src/webapp/WEB-INF/bootstrap.jsp b/roster2/src/webapp/WEB-INF/bootstrap.jsp
@@ -82,7 +82,7 @@
 
 <script type="text/javascript" src="/library/webjars/jquery/1.11.3/jquery.min.js"></script>
 <script type="text/javascript" src="/library/webjars/jquery-i18n-properties/1.2.2/jquery.i18n.properties.min.js"></script>
-<script type="text/javascript" src="/library/webjars/jquery-migrate/1.2.1/jquery-migrate.min.js"></script>
+<script type="text/javascript" src="/library/webjars/jquery-migrate/1.4.0/jquery-migrate.min.js"></script>
 <script type="text/javascript" src="/profile2-tool/javascript/profile2-eb.js"></script>
 <script type="text/javascript" src="/sakai-roster2-tool/lib/handlebars.runtime-v2.0.0.js"></script>
 <script type="text/javascript" src="/sakai-roster2-tool/templates.js"></script>

diff --git a/rsf/sakai-rsf-web/templates/src/webapp/content/templates/sakai-date-field-input.html b/rsf/sakai-rsf-web/templates/src/webapp/content/templates/sakai-date-field-input.html
@@ -14,7 +14,7 @@
 	href="/library/js/jquery/ui/1.10.3/css/ui-lightness/jquery-ui-1.10.3.custom.min.css"
 	rel="stylesheet" type="text/css" rsf:id="scr=contribute-style" />
 <script type="text/javascript"
-	src="/library/webjars/jquery-migrate/1.2.1/jquery-migrate.min.js"
+	src="/library/webjars/jquery-migrate/1.4.0/jquery-migrate.min.js"
 	rsf:id="scr=contribute-script"></script>
 <script type="text/javascript"
 	src="/library/js/lang-datepicker/lang-datepicker.js"