diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-19 10:26:08 +0200 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-19 10:26:08 +0200 |
| commit | 7186975e35d03312f46b27d808a98f7bc6064078 (patch) | |
| tree | 659f716702525a85c4e0efdf41ca9b8a71800e64 /core/js | |
| parent | 7054b9719b4bb48dbe82303a4bfb18fe3b087b47 (diff) | |
| parent | 5900e46f01b41b0cc493990cc72fa553db70b7a5 (diff) | |
| download | nextcloud-server-7186975e35d03312f46b27d808a98f7bc6064078.tar.gz nextcloud-server-7186975e35d03312f46b27d808a98f7bc6064078.zip | |
Merge pull request #23993 from owncloud/update-to-jquery2
Update jquery to version 2.2.3
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/core.json | 2 | ||||
| -rw-r--r-- | core/js/tests/specs/coreSpec.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/js/core.json b/core/js/core.json index d894d59ca54..555c683f6f7 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 f18ecbc1a44..83441104289 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('<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); |