diff options
| author | blizzz <blizzz@owncloud.com> | 2015-11-02 13:32:24 +0100 |
|---|---|---|
| committer | blizzz <blizzz@owncloud.com> | 2015-11-02 13:32:24 +0100 |
| commit | 83d3c94590aa877fe23a5d49c991e617d76a6060 (patch) | |
| tree | 88813a6c5e13381bf8a23723862a6b7d7ea56a92 /core/js | |
| parent | 16aa33947581959eeb9a89530ad0152cb2c33c25 (diff) | |
| parent | a8641fdc9559d67696fb612597c4b27d1832220a (diff) | |
| download | nextcloud-server-83d3c94590aa877fe23a5d49c991e617d76a6060.tar.gz nextcloud-server-83d3c94590aa877fe23a5d49c991e617d76a6060.zip | |
Merge branch 'master' into fix-20151
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/js.js | 2 | ||||
| -rw-r--r-- | core/js/tests/specs/coreSpec.js | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/js/js.js b/core/js/js.js index a3efb64e4bd..460f65256a9 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1295,7 +1295,7 @@ function initCore() { */ function setupMainMenu() { // toggle the navigation - var $toggle = $('#header .menutoggle'); + var $toggle = $('#header .header-appname-container'); var $navigation = $('#navigation'); // init the menu diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index 3ebe55305f7..f653fc88637 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/core/js/tests/specs/coreSpec.js @@ -458,12 +458,11 @@ describe('Core base tests', function() { var clock; var $toggle; var $navigation; - var clock; beforeEach(function() { clock = sinon.useFakeTimers(); $('#testArea').append('<div id="header">' + - '<a class="menutoggle" href="#">' + + '<a class="menutoggle header-appname-container" href="#">' + '<h1 class="header-appname"></h1>' + '<div class="icon-caret"></div>' + '</a>' + |