From a3e44763df1e73c1bfe116faa093a4f306529bff Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 24 Apr 2015 04:47:23 -0400 Subject: [PATCH] feature(client) rm MousePosition --- lib/client.js | 1 - lib/client/edit.js | 10 +++++++--- lib/client/listeners.js | 12 ------------ lib/client/menu.js | 7 +++---- lib/client/view.js | 7 +++++-- 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/lib/client.js b/lib/client.js index 5442b019..b8a9f7e0 100644 --- a/lib/client.js +++ b/lib/client.js @@ -23,7 +23,6 @@ var Util, DOM, CloudFunc, join; this.log = log, this.PREFIX = '', - this.MousePosition = {}; this.LIBDIR = '/lib/'; this.LIBDIRCLIENT = '/lib/client/'; this.MIN_ONE_PANEL_WIDTH = 1155; diff --git a/lib/client/edit.js b/lib/client/edit.js index 5b3cf910..dcbf8092 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -148,11 +148,15 @@ var CloudCmd, Util, DOM, CloudFunc, MenuIO, Format, edward; }); } - function setMenu() { + function setMenu(event) { + var position = { + x: event.clientX, + y: event.clientY + }; + if (!Menu) { DOM.loadRemote('menu', function(error) { - var position = CloudCmd.MousePosition, - options = { + var options = { beforeShow: function(params) { params.x -= 18; params.y -= 27; diff --git a/lib/client/listeners.js b/lib/client/listeners.js index 302659d1..f84663c8 100644 --- a/lib/client/listeners.js +++ b/lib/client/listeners.js @@ -26,7 +26,6 @@ var Util, DOM, CloudFunc, CloudCmd; unload(); pop(); online(); - mousemove(); }; this.initKeysPanel = function() { @@ -106,17 +105,6 @@ var Util, DOM, CloudFunc, CloudCmd; } } - function mousemove() { - DOM.Events.add('mousemove', function(event) { - var position = CloudCmd.MousePosition, - x = event.clientX, - y = event.clientY; - - position.x = x; - position.y = y; - }); - } - function execIfNotUL(callback, event) { var element = event.target, tag = element.tagName; diff --git a/lib/client/menu.js b/lib/client/menu.js index 0be4753c..51a99b6d 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -15,8 +15,7 @@ var CloudCmd, Util, DOM, CloudFunc, MenuIO; Images = DOM.Images, MenuShowedName, MenuContext, - MenuContextFile, - Position = CloudCmd.MousePosition; + MenuContextFile; this.ENABLED = false; @@ -58,8 +57,8 @@ var CloudCmd, Util, DOM, CloudFunc, MenuIO; function show(x, y) { if (!x || !y) { - x = (position || Position).x; - y = (position || Position).y; + x = position.x; + y = position.y; } if (!Loading) { diff --git a/lib/client/view.js b/lib/client/view.js index 27a91183..2b8870bf 100644 --- a/lib/client/view.js +++ b/lib/client/view.js @@ -287,9 +287,12 @@ var CloudCmd, Util, DOM, CloudFunc, $; var isCurrent, isFiles, isFilesPassive, files = Info.files, filesPassive = Info.filesPassive, - position = CloudCmd.MousePosition, element = event.target, - isOverlay = element === overlay; + isOverlay = element === overlay, + position = { + x: event.clientX, + y: event.clientY + }; if (isOverlay) { hideOverlay();