wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #968 from Faldon/fixing_spinner_animation

Browse source 
Fixing infinite spinner animation
This commit is contained in:
Lukas Reschke 2016-08-27 22:43:03 +02:00 committed by GitHub
commit ccbbf61ed6
1 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
core/js/js.js
View file

@ -1506,12 +1506,20 @@ function initCore() {
if(!$app.is('a')) {
$app = $app.closest('a');
}
if(!event.ctrlKey) {
if(event.which === 1 && !event.ctrlKey && !event.metaKey) {
$app.addClass('app-loading');
} else {
// Close navigation when opening app in
// a new tab
OC.hideMenus();
OC.hideMenus(function(){return false});
}
});
$navigation.delegate('a', 'mouseup', function(event) {
if(event.which === 2) {
// Close navigation when opening app in
// a new tab via middle click
OC.hideMenus(function(){return false});
}
});
}
@ -1519,14 +1527,29 @@ function initCore() {
function setupUserMenu() {
var $menu = $('#header #settings');
// show loading feedback
$menu.delegate('a', 'click', function(event) {
var $page = $(event.target);
if (!$page.is('a')) {
$page = $page.closest('a');
}
$page.find('img').remove();
$page.find('div').remove(); // prevent odd double-clicks
$page.prepend($('<div/>').addClass('icon-loading-small-dark'));
if(event.which === 1 && !event.ctrlKey && !event.metaKey) {
$page.find('img').remove();
$page.find('div').remove(); // prevent odd double-clicks
$page.prepend($('<div/>').addClass('icon-loading-small-dark'));
} else {
// Close navigation when opening menu entry in
// a new tab
OC.hideMenus(function(){return false});
}
});
$menu.delegate('a', 'mouseup', function(event) {
if(event.which === 2) {
// Close navigation when opening app in
// a new tab via middle click
OC.hideMenus(function(){return false});
}
});
}