From 27b19aaba1c9a710bb2b1d3338a74ba05ea0678e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 25 Apr 2017 17:31:04 +0200 Subject: [PATCH] Fix loading spinner for new app menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- core/css/header.scss | 31 ++++++++++++++++++------------- core/js/js.js | 15 +++++++++++++++ 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/core/css/header.scss b/core/css/header.scss index 3805dd493e7..619852faf60 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -294,19 +294,21 @@ nav { max-height: 32px; max-width: 32px; } - /* loading feedback for apps */ - .app-loading { - .icon-loading-small-dark { - display: inline !important; - position: absolute; - left: 12px; - width: 16px; - height: 16px; - } - .app-icon { - -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=0)'; - opacity: 0; - } + +} + +/* loading feedback for apps */ +.app-loading { + .icon-loading-small-dark { + display: inline !important; + position: absolute; + left: 12px; + width: 16px; + height: 16px; + } + .app-icon { + -ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=0)'; + opacity: 0; } } @@ -467,6 +469,9 @@ nav { opacity: .6; } } + .app-loading .icon-loading-small-dark { + top:12px; + } li:hover a, diff --git a/core/js/js.js b/core/js/js.js index 5fdafa6e412..95c00dd6448 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1398,6 +1398,7 @@ function initCore() { // toggle the navigation var $toggle = $('#header .header-appname-container'); var $navigation = $('#navigation'); + var $appmenu = $('#appmenu'); // init the menu OC.registerMenu($toggle, $navigation); @@ -1427,6 +1428,20 @@ function initCore() { OC.hideMenus(function(){return false}); } }); + + $appmenu.delegate('a', 'click', function(event) { + var $app = $(event.target); + if(!$app.is('a')) { + $app = $app.closest('a'); + } + if(event.which === 1 && !event.ctrlKey && !event.metaKey) { + $app.addClass('app-loading'); + } else { + // Close navigation when opening app in + // a new tab + OC.hideMenus(function(){return false}); + } + }); } function setupUserMenu() {