From b210a784e17dba32d4e3f69511797f0ab48e470d Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 22 May 2015 05:42:12 -0400 Subject: [PATCH] feature(listeners) rm onContextMenu --- lib/client/listeners.js | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/lib/client/listeners.js b/lib/client/listeners.js index 5665927d..51daac98 100644 --- a/lib/client/listeners.js +++ b/lib/client/listeners.js @@ -10,12 +10,11 @@ var Util, DOM, CloudFunc, CloudCmd; Storage = DOM.Storage, Events = DOM.Events, EventsFiles = { - 'mousedown' : Util.exec.with(execIfNotUL, setCurrentFileByEvent), - 'contextmenu' : onContextMenu, - 'click' : onClick, - 'dragstart' : Util.exec.with(execIfNotUL, onDragStart), - 'dblclick' : Util.exec.with(execIfNotUL, onDblClick), - 'touchstart' : Util.exec.with(execIfNotUL, onTouch) + 'mousedown' : Util.exec.with(execIfNotUL, setCurrentFileByEvent), + 'click' : onClick, + 'dragstart' : Util.exec.with(execIfNotUL, onDragStart), + 'dblclick' : Util.exec.with(execIfNotUL, onDblClick), + 'touchstart': Util.exec.with(execIfNotUL, onTouch) }; this.init = function () { @@ -170,24 +169,6 @@ var Util, DOM, CloudFunc, CloudCmd; } } - function onContextMenu(event) { - var element = event.target, - tag = element.tagName, - isUL = tag === 'UL'; - - if (!isUL) { - element = getLIElement(event.target); - DOM.setCurrentFile(element); - } - - Util.exec(CloudCmd.Menu, { - x: event.clientX, - y: event.clientY - }); - - changePanel(element); - } - /* * download file from browser to desktop * in Chrome (HTML5) @@ -232,6 +213,13 @@ var Util, DOM, CloudFunc, CloudCmd; } function contextMenu() { + Events.addOnce('contextmenu', DOM.getFM(), function() { + CloudCmd.Menu.show({ + x: event.clientX, + y: event.clientY + }); + }); + Events.addContextMenu(document, function(event) { CloudCmd.Menu.ENABLED || event.preventDefault(); });