diff --git a/bower.json b/bower.json index ae9575249c..74c4be96a2 100644 --- a/bower.json +++ b/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", diff --git a/core/js/core.json b/core/js/core.json index d894d59ca5..555c683f6f 100644 --- a/core/js/core.json +++ b/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", diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index f18ecbc1a4..8344110428 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/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('