diff --git a/lib/client/dom.js b/lib/client/dom.js index 60944633..25426459 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -1301,11 +1301,6 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; return ret; }; - /** prevent default event */ - this.preventDefault = function(event) { - event.preventDefault(); - }; - /** * shows panel right or left (or active) */ diff --git a/lib/client/events.js b/lib/client/events.js index e43edfe2..1356a827 100644 --- a/lib/client/events.js +++ b/lib/client/events.js @@ -310,5 +310,9 @@ var Util, DOM; return ret; }; + + this.preventDefault = function(event) { + event.preventDefault(); + }; } })(Util, DOM); diff --git a/lib/client/key.js b/lib/client/key.js index 0644d8fc..a951463f 100644 --- a/lib/client/key.js +++ b/lib/client/key.js @@ -3,6 +3,7 @@ var CloudCmd, Util, DOM; 'use strict'; var Info = DOM.CurrentInfo, + Events = DOM.Events, Chars = [], KEY = { BACKSPACE : 8, @@ -64,16 +65,20 @@ var CloudCmd, Util, DOM; var Key = this, Binded; - this.isBind = function() {return Binded;}; + this.isBind = function() { + return Binded; + }; - this.setBind = function() {Binded = true;}; + this.setBind = function() { + Binded = true; + }; - this.unsetBind = function() {Binded = false;}; + this.unsetBind = function() { + Binded = false; + }; this.bind = function() { - DOM.Events.addKey(listener); - - /* клавиши назначены*/ + Events.addKey(listener); Binded = true; }; @@ -102,7 +107,7 @@ var CloudCmd, Util, DOM; '+s clear Storage key-handler - set \n' + 'press +q to remove them'); - DOM.preventDefault(event); + Events.preventDefault(event); } } @@ -203,13 +208,13 @@ var CloudCmd, Util, DOM; case Key.SLASH: if (shift) { Util.exec(CloudCmd.Help.show); - DOM.preventDefault(event); + Events.preventDefault(event); } break; case Key.F1: Util.exec(CloudCmd.Help.show); - DOM.preventDefault(event); + Events.preventDefault(event); break; case Key.F2: @@ -221,22 +226,22 @@ var CloudCmd, Util, DOM; Util.exec(CloudCmd.Markdown.show, path); else Util.exec(CloudCmd.View.show); - DOM.preventDefault(event); + Events.preventDefault(event); break; case Key.F4: Util.exec(CloudCmd.Edit.show); - DOM.preventDefault(event); + Events.preventDefault(event); break; case Key.F5: DOM.copyFiles(); - DOM.preventDefault(event); + Events.preventDefault(event); break; case Key.F6: DOM.moveFiles(); - DOM.preventDefault(event); + Events.preventDefault(event); break; case Key.F7: @@ -252,13 +257,13 @@ var CloudCmd, Util, DOM; case Key.F9: Util.exec(CloudCmd.Menu); - DOM.preventDefault(event); + Events.preventDefault(event); break; case Key.F10: Util.exec(CloudCmd.Config.show); - DOM.preventDefault(event); + Events.preventDefault(event); break; @@ -271,7 +276,7 @@ var CloudCmd, Util, DOM; obj = CloudCmd.Console; Util.exec(obj.show); - DOM.preventDefault(event); + Events.preventDefault(event); break; @@ -290,7 +295,7 @@ var CloudCmd, Util, DOM; DOM.loadCurrentSize(callback, current); }); - DOM.preventDefault(event); + Events.preventDefault(event); break; /* навигация по таблице файлов * @@ -301,7 +306,7 @@ var CloudCmd, Util, DOM; DOM.toggleSelectedFile(current); DOM.setCurrentFile(prev); - DOM.preventDefault(event); + Events.preventDefault(event); break; /* если нажали клавишу в низ - выделяем следующую строку */ @@ -310,7 +315,7 @@ var CloudCmd, Util, DOM; DOM.toggleSelectedFile(current); DOM.setCurrentFile(next); - DOM.preventDefault(event); + Events.preventDefault(event); break; /* если нажали клавишу Home * @@ -318,13 +323,13 @@ var CloudCmd, Util, DOM; * элементу */ case Key.HOME: DOM.setCurrentFile(Info.first); - DOM.preventDefault(event); + Events.preventDefault(event); break; /* если нажали клавишу End выделяем последний элемент */ case Key.END: DOM.setCurrentFile(Info.last); - DOM.preventDefault(event); + Events.preventDefault(event); break; /* если нажали клавишу page down проматываем экран */ @@ -339,7 +344,7 @@ var CloudCmd, Util, DOM; current = current.nextSibling; } DOM.setCurrentFile(current); - DOM.preventDefault(event); + Events.preventDefault(event); break; /* если нажали клавишу page up проматываем экран */ @@ -364,7 +369,7 @@ var CloudCmd, Util, DOM; } DOM.setCurrentFile(current); - DOM.preventDefault(event); + Events.preventDefault(event); break; /* открываем папку*/ @@ -375,7 +380,7 @@ var CloudCmd, Util, DOM; case Key.BACKSPACE: CloudCmd.goToParentDir(); - DOM.preventDefault(event); + Events.preventDefault(event); break; case Key.BACKSLASH: @@ -406,7 +411,7 @@ var CloudCmd, Util, DOM; 'press +q to remove all key-handlers'); CloudCmd.refresh(); - DOM.preventDefault(event); + Events.preventDefault(event); } break; @@ -418,7 +423,7 @@ var CloudCmd, Util, DOM; 'press +q to remove all key-handlers'); DOM.Storage.clear(); - DOM.preventDefault(); + Events.preventDefault(); } break; @@ -431,7 +436,7 @@ var CloudCmd, Util, DOM; 'press +s to to set them'); Binded = false; - DOM.preventDefault(event); + Events.preventDefault(event); } break; } diff --git a/lib/client/listeners.js b/lib/client/listeners.js index 6e498f1e..9855eaa8 100644 --- a/lib/client/listeners.js +++ b/lib/client/listeners.js @@ -140,7 +140,7 @@ var Util, DOM, CloudCmd; var ctrl = event.ctrlKey; if (!ctrl) - DOM.preventDefault(event); + Events.preventDefault(event); changePanel(event.target); } @@ -160,7 +160,7 @@ var Util, DOM, CloudCmd; if (isDir) { CloudCmd.loadDir(); - DOM.preventDefault(event); + Events.preventDefault(event); } } @@ -174,7 +174,7 @@ var Util, DOM, CloudCmd; if (isCurrent) { CloudCmd.loadDir(); - DOM.preventDefault(event); + Events.preventDefault(event); } } } @@ -258,7 +258,7 @@ var Util, DOM, CloudCmd; function contextMenu() { Events.addContextMenu(document, function(event) { - CloudCmd.Menu.ENABLED || DOM.preventDefault(event); + CloudCmd.Menu.ENABLED || Events.preventDefault(event); }); } @@ -315,7 +315,7 @@ var Util, DOM, CloudCmd; isBind = Key && Key.isBind(); if (!isBind) { - DOM.preventDefault(event); + Events.preventDefault(event); ret = 'Please make sure that you saved all work.'; } diff --git a/lib/client/menu.js b/lib/client/menu.js index 51fedd1c..350973fb 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -242,7 +242,7 @@ var CloudCmd, Util, DOM, CloudFunc, MenuIO; MenuContext.show(x, y); - DOM.preventDefault(event); + Events.preventDefault(event); } else if (key === ESC) { Menu.hide(); }