From dc905720b9e65ae38d370663b5952bb8e4d0b218 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 8 May 2014 05:38:28 -0400 Subject: [PATCH] feature(client) loadDir: rm event --- lib/client.js | 5 +---- lib/client/listeners.js | 12 ++++++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/client.js b/lib/client.js index 7a87917e..e0b621cd 100644 --- a/lib/client.js +++ b/lib/client.js @@ -35,7 +35,7 @@ var Util, DOM, CloudFunc; * } * @param event */ - this.loadDir = function(params, event) { + this.loadDir = function(params) { var link, imgPosition, panelChanged, pathParams, isRefresh, panel, currentLink = DOM.getCurrentLink(), @@ -72,11 +72,8 @@ var Util, DOM, CloudFunc; refresh: isRefresh }, panel); } - - DOM.preventDefault(event); }; - /** * функция устанавливает курсор на каталог * с которого мы пришли, если мы поднялись diff --git a/lib/client/listeners.js b/lib/client/listeners.js index 7dbc9ab6..35b56f80 100644 --- a/lib/client/listeners.js +++ b/lib/client/listeners.js @@ -200,8 +200,10 @@ var Util, DOM, CloudCmd; var current = getLIElement(event.target), isDir = DOM.isCurrentIsDir(current); - if (isDir) - CloudCmd.loadDir(null, event); + if (isDir) { + CloudCmd.loadDir(); + DOM.preventDefault(event); + } } function onTouch(event) { @@ -212,8 +214,10 @@ var Util, DOM, CloudCmd; if (isDir) { isCurrent = DOM.isCurrentFile(element); - if (isCurrent) - CloudCmd.loadDir(null, event); + if (isCurrent) { + CloudCmd.loadDir(); + DOM.preventDefault(event); + } } }