From 748bb1b7b2d745b19a2f3bfb1804acb942c32660 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 24 Apr 2015 08:23:38 -0400 Subject: [PATCH] feature(cloudfunc) rm LEFT, RIGHT --- html/fs/panel.html | 2 +- lib/client.js | 10 ++++------ lib/client/listeners.js | 16 ++++++++++++---- lib/cloudfunc.js | 4 ---- lib/server/route.js | 4 ---- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/html/fs/panel.html b/html/fs/panel.html index e45a9383..9179d764 100644 --- a/html/fs/panel.html +++ b/html/fs/panel.html @@ -1 +1 @@ -
{{ content }}
\ No newline at end of file +
{{ content }}
\ No newline at end of file diff --git a/lib/client.js b/lib/client.js index b8a9f7e0..65fab88d 100644 --- a/lib/client.js +++ b/lib/client.js @@ -267,9 +267,7 @@ var Util, DOM, CloudFunc, join; function baseInit(callback) { var dirPath = '', - files = DOM.getFiles(), - LEFT = CloudFunc.PANEL_LEFT, - RIGHT = CloudFunc.PANEL_RIGHT; + files = DOM.getFiles(); /* выделяем строку с первым файлом */ if (files) @@ -279,8 +277,8 @@ var Util, DOM, CloudFunc, join; Listeners = CloudCmd.Listeners; Listeners.init(); - Listeners.setOnPanel(LEFT); - Listeners.setOnPanel(RIGHT); + Listeners.setOnPanel('left'); + Listeners.setOnPanel('right'); Listeners.initKeysPanel(); @@ -427,7 +425,7 @@ var Util, DOM, CloudFunc, join; } }); - Listeners.setOnPanel(panel.id); + Listeners.setOnPanel(panel); if (!noCurrent) { if (name === '..' && dir !== '/') diff --git a/lib/client/listeners.js b/lib/client/listeners.js index f84663c8..09563023 100644 --- a/lib/client/listeners.js +++ b/lib/client/listeners.js @@ -59,10 +59,18 @@ var Util, DOM, CloudFunc, CloudCmd; }); }; - this.setOnPanel = function(panelId) { - var panel = DOM.getById(panelId), - filesElement = DOM.getByDataName('js-files', panel), - pathElement = DOM.getByDataName('js-path', panel); + this.setOnPanel = function(side) { + var panel, + filesElement, + pathElement; + + if (typeof side === 'string') + panel = DOM.getById('js-' + side); + else + panel = side; + + filesElement = DOM.getByDataName('js-files', panel); + pathElement = DOM.getByDataName('js-path', panel); /* ставим загрузку гифа на клик*/ Events.addClick(pathElement, onPathElementClick); diff --git a/lib/cloudfunc.js b/lib/cloudfunc.js index 18b2ce0b..47537f15 100644 --- a/lib/cloudfunc.js +++ b/lib/cloudfunc.js @@ -28,11 +28,7 @@ var Util; this.FS = FS = '/fs'; this.apiURL = '/api/v1'; - /* id панелей с файлами */ - this.PANEL_LEFT = 'js-left'; - this.PANEL_RIGHT = 'js-right'; this.MAX_FILE_SIZE = 500 * 1024; - this.Entity = Entity; function entityProto() { diff --git a/lib/server/route.js b/lib/server/route.js index 8c3183cf..8d410a61 100644 --- a/lib/server/route.js +++ b/lib/server/route.js @@ -49,8 +49,6 @@ function indexProcessing(options) { var left, right, from, to, keysPanel = '