Revert "Fixing infinite spinning animation on user menu ctrl+click"
This commit is contained in:
parent
5580a77bd7
commit
8e08b8c04e
|
@ -1501,21 +1501,17 @@ function initCore() {
|
||||||
$navigation.hide();
|
$navigation.hide();
|
||||||
|
|
||||||
// show loading feedback
|
// show loading feedback
|
||||||
$navigation.delegate('a', 'mousedown', function(event) {
|
$navigation.delegate('a', 'click', function(event) {
|
||||||
var $app = $(event.target);
|
var $app = $(event.target);
|
||||||
if(!$app.is('a')) {
|
if(!$app.is('a')) {
|
||||||
$app = $app.closest('a');
|
$app = $app.closest('a');
|
||||||
}
|
}
|
||||||
if(event.which === 1 && !event.ctrlKey && !event.metaKey) {
|
if(!event.ctrlKey) {
|
||||||
$app.addClass('app-loading');
|
$app.addClass('app-loading');
|
||||||
} else {
|
} else {
|
||||||
// On middle click or on first button click with ctrl key or meta key hold
|
// Close navigation when opening app in
|
||||||
if(event.which === 2 || (event.which === 1 && (event.ctrlKey || event.metaKey))) {
|
// a new tab
|
||||||
// Close navigation when opening app in
|
OC.hideMenus();
|
||||||
// a new tab
|
|
||||||
OC.hideMenus();
|
|
||||||
window.open($app, '_blank');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -1523,26 +1519,14 @@ function initCore() {
|
||||||
function setupUserMenu() {
|
function setupUserMenu() {
|
||||||
var $menu = $('#header #settings');
|
var $menu = $('#header #settings');
|
||||||
|
|
||||||
// show loading feedback
|
$menu.delegate('a', 'click', function(event) {
|
||||||
$menu.delegate('a', 'mousedown', function(event) {
|
|
||||||
var $page = $(event.target);
|
var $page = $(event.target);
|
||||||
if (!$page.is('a')) {
|
if (!$page.is('a')) {
|
||||||
$page = $page.closest('a');
|
$page = $page.closest('a');
|
||||||
}
|
}
|
||||||
if(event.which === 1 && !event.ctrlKey && !event.metaKey) {
|
$page.find('img').remove();
|
||||||
$page.find('img').remove();
|
$page.find('div').remove(); // prevent odd double-clicks
|
||||||
$page.find('div').remove(); // prevent odd double-clicks
|
$page.prepend($('<div/>').addClass('icon-loading-small-dark'));
|
||||||
$page.prepend($('<div/>').addClass('icon-loading-small-dark'));
|
|
||||||
} else {
|
|
||||||
// On middle click or on first button click with ctrl key or meta key hold
|
|
||||||
if(event.which === 2 || (event.which === 1 && (event.ctrlKey || event.metaKey))) {
|
|
||||||
// Close navigation when opening menu entry in
|
|
||||||
// a new tab
|
|
||||||
OC.hideMenus();
|
|
||||||
window.open($page, '_blank');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$($page).click();
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue