Merge pull request #23993 from owncloud/update-to-jquery2

Update jquery to version 2.2.3

bower.json

@@ -16,8 +16,8 @@
     "blueimp-md5": "~1.1.0",
     "handlebars": "~1.3.0",
     "jcrop": "~0.9.12",
-    "jquery": "~1.10.0",
-    "jquery-migrate": "~1.2.1",
+    "jquery": "~2.2.0",
+    "jquery-migrate": "~1.4.0",
     "jquery-ui": "1.10.0",
     "jsTimezoneDetect": "~1.0.5",
     "moment": "~2.10.0",

core/js/core.json

@@ -1,6 +1,6 @@
 {
 	"vendor": [
-		"jquery/jquery.min.js",
+		"jquery/dist/jquery.min.js",
 		"jquery-migrate/jquery-migrate.min.js",
 		"jquery-ui/ui/jquery-ui.custom.js",
 		"underscore/underscore.js",

core/js/tests/specs/coreSpec.js

@@ -470,6 +470,7 @@ describe('Core base tests', function() {
 		var $navigation;
 
 		beforeEach(function() {
+			jQuery.fx.off = true;
 			clock = sinon.useFakeTimers();
 			$('#testArea').append('<div id="header">' +
 				'<a class="menutoggle header-appname-container" href="#">' +
@@ -482,6 +483,7 @@ describe('Core base tests', function() {
 			$navigation = $('#navigation');
 		});
 		afterEach(function() {
+			jQuery.fx.off = false;
 			clock.restore();
 			$(document).off('ajaxError');
 		});
@@ -491,7 +493,6 @@ describe('Core base tests', function() {
 		});
 		it('Clicking menu toggle toggles navigation in', function() {
 			window.initCore();
-			$navigation.hide(); // normally done through media query triggered CSS
 			expect($navigation.is(':visible')).toEqual(false);
 			$toggle.click();
 			clock.tick(1 * 1000);

core/vendor/.gitignore

@@ -36,7 +36,7 @@ moment/templates
 # jquery
 jquery/**
 !jquery/.bower.json
-!jquery/jquery.*
+!jquery/dist/jquery.*
 !jquery/MIT-LICENSE.txt
 
 # jquery-ui

core/vendor/jquery-migrate/.bower.json

@@ -1,15 +1,15 @@
 {
   "name": "jquery-migrate",
-  "version": "1.2.1",
+  "version": "1.4.0",
+  "main": "jquery-migrate.js",
   "homepage": "https://github.com/appleboy/jquery-migrate",
-  "_release": "1.2.1",
+  "_release": "1.4.0",
   "_resolution": {
     "type": "version",
-    "tag": "1.2.1",
-    "commit": "65f37b60ae3d305efbe1e85909e14c60d524d12a"
+    "tag": "1.4.0",
+    "commit": "d70e5a532864fdc2263f0d15030ef84671fc5807"
   },
-  "_source": "git://github.com/appleboy/jquery-migrate.git",
-  "_target": "~1.2.1",
-  "_originalSource": "jquery-migrate",
-  "_direct": true
+  "_source": "https://github.com/appleboy/jquery-migrate.git",
+  "_target": "~1.4.0",
+  "_originalSource": "jquery-migrate"
 }

core/vendor/jquery-migrate/component.json

@@ -1,4 +0,0 @@
-{
-    "name" : "jquery-migrate",
-    "version" : "1.2.1"
-}

core/vendor/jquery/.bower.json

@@ -1,21 +1,38 @@
 {
   "name": "jquery",
-  "version": "1.10.2",
-  "description": "jQuery component",
+  "version": "2.1.4",
+  "main": "dist/jquery.js",
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "build",
+    "dist/cdn",
+    "speed",
+    "test",
+    "*.md",
+    "AUTHORS.txt",
+    "Gruntfile.js",
+    "package.json"
+  ],
+  "devDependencies": {
+    "sizzle": "2.1.1-jquery.2.1.2",
+    "requirejs": "2.1.10",
+    "qunit": "1.14.0",
+    "sinon": "1.8.1"
+  },
   "keywords": [
     "jquery",
-    "component"
+    "javascript",
+    "library"
   ],
-  "main": "jquery.js",
-  "license": "MIT",
-  "homepage": "https://github.com/jquery/jquery",
-  "_release": "1.10.2",
+  "homepage": "https://github.com/jquery/jquery-dist",
+  "_release": "2.1.4",
   "_resolution": {
     "type": "version",
-    "tag": "1.10.2",
-    "commit": "16b079b164d62bd807c612806842a13bf9b04d17"
+    "tag": "2.1.4",
+    "commit": "7751e69b615c6eca6f783a81e292a55725af6b85"
   },
-  "_source": "git://github.com/jquery/jquery.git",
-  "_target": "~1.10.0",
+  "_source": "https://github.com/jquery/jquery-dist.git",
+  "_target": "~2.1.0",
   "_originalSource": "jquery"
 }

core/vendor/jquery/MIT-LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2013 jQuery Foundation and other contributors
+Copyright 2014 jQuery Foundation and other contributors
 http://jquery.com/
 
 Permission is hereby granted, free of charge, to any person obtaining