Skip to content

Revert "Fixing infinite spinning animation on user menu ctrl+click" #929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Aug 18, 2016
Merged

Revert "Fixing infinite spinning animation on user menu ctrl+click" #929

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 9 additions & 25 deletions core/js/js.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1501,48 +1501,32 @@ function initCore() {
$navigation.hide();

// show loading feedback
$navigation.delegate('a', 'mousedown', function(event) {
$navigation.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) {
if(!event.ctrlKey) {
$app.addClass('app-loading');
} 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 app in
// a new tab
OC.hideMenus();
window.open($app, '_blank');
}
// Close navigation when opening app in
// a new tab
OC.hideMenus();
}
});
}

function setupUserMenu() {
var $menu = $('#header #settings');

// show loading feedback
$menu.delegate('a', 'mousedown', function(event) {
$menu.delegate('a', 'click', function(event) {
var $page = $(event.target);
if (!$page.is('a')) {
$page = $page.closest('a');
}
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 {
// 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();
$page.find('img').remove();
$page.find('div').remove(); // prevent odd double-clicks
$page.prepend($('<div/>').addClass('icon-loading-small-dark'));
});
}

Expand Down