diff options
| author | Thomas Pulzer <t.pulzer@kniel.de> | 2016-07-29 14:32:25 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-08-09 11:58:32 +0200 |
| commit | 8c9961aa22ee07a121382565e5efa679d46f3d36 (patch) | |
| tree | 69dc0d97200a085d8ce69f4defc476ed3e050912 /core/js | |
| parent | 1ab9477ac1c89821cbf397eacc647ee8be1f3379 (diff) | |
| download | nextcloud-server-8c9961aa22ee07a121382565e5efa679d46f3d36.tar.gz nextcloud-server-8c9961aa22ee07a121382565e5efa679d46f3d36.zip | |
Added OS X meta key check for stopping spinning animation in app and user menu.
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/js.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/js.js b/core/js/js.js index 31d5b87712c..2b0b6e28915 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1506,7 +1506,7 @@ function initCore() { if(!$app.is('a')) { $app = $app.closest('a'); } - if(!event.ctrlKey) { + if(!event.ctrlKey && !event.metaKey) { $app.addClass('app-loading'); } else { // Close navigation when opening app in @@ -1525,7 +1525,7 @@ function initCore() { if (!$page.is('a')) { $page = $page.closest('a'); } - if(!event.ctrlKey) { + if(!event.ctrlKey && !event.metaKey) { $page.find('img').remove(); $page.find('div').remove(); // prevent odd double-clicks $page.prepend($('<div/>').addClass('icon-loading-small-dark')); |