Merge pull request #3509 from owncloud/update_jquery_to_1_10

Update jquery to 1.10.0 and add jquery-migrate 1.2.1
13 years ago · 476747ee89
parent aa1c5a5d63 3001db6b50
commit 476747ee89
4 changed files with 10 additions and 5 deletions
--- a/core/js/jquery-1.10.0.min.js
+++ b/core/js/jquery-1.10.0.min.js
--- a/core/js/jquery-1.7.2.min.js
+++ b/core/js/jquery-1.7.2.min.js
--- a/core/js/jquery-migrate-1.2.1.min.js
+++ b/core/js/jquery-migrate-1.2.1.min.js
--- a/lib/base.php
+++ b/lib/base.php
@ -258,7 +258,8 @@ class OC {

 	public static function initTemplateEngine() {
 		// Add the stuff we need always
-		OC_Util::addScript("jquery-1.7.2.min");
+		OC_Util::addScript("jquery-1.10.0.min");
+		OC_Util::addScript("jquery-migrate-1.2.1.min");
 		OC_Util::addScript("jquery-ui-1.10.0.custom");
 		OC_Util::addScript("jquery-showpassword");
 		OC_Util::addScript("jquery.infieldlabel");