0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

make sure item menu doesn't blink on drag & drop

Browse source
This commit is contained in:
rolux 2013-08-06 19:56:11 +00:00
parent 8f5abd2cc1
commit 2543cf756f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
static/js/mainMenu.js
View file

@ -745,16 +745,16 @@ pandora.ui.mainMenu = function() {
pandora.clipboard.bindEvent(function(data, event) { pandora.clipboard.bindEvent(function(data, event) {
if (Ox.contains(['add', 'copy', 'clear'], event)) { if (Ox.contains(['add', 'copy', 'clear'], event)) {
that.replaceMenu('itemMenu', getItemMenu()); that.replaceMenu('itemMenu', getItemMenu());
if (Ox.contains(['add', 'copy'], event) && !fromMenu) {
that.highlightMenu('itemMenu');
} }
if (Ox.contains(['add', 'copy', 'paste'], event) && !fromMenu) {
that.highlightMenu('itemMenu');
} }
fromMenu = false; fromMenu = false;
}); });
pandora.history.bindEvent(function(data, event) { pandora.history.bindEvent(function(data, event) {
that.replaceMenu('itemMenu', getItemMenu()); that.replaceMenu('itemMenu', getItemMenu());
if (Ox.contains(['add', 'undo', 'redo'], event) && !fromMenu) { if (Ox.contains(['undo', 'redo'], event) && !fromMenu) {
that.highlightMenu('itemMenu'); that.highlightMenu('itemMenu');
} }
fromMenu = false; fromMenu = false;