From c5279d4896731e24de47f6aacf1e1bb3650df512 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Tue, 2 Dec 2014 04:00:13 -0500 Subject: [PATCH] feature(dom) images show.load: top true -> "top" --- lib/client.js | 4 +--- lib/client/config.js | 4 +--- lib/client/contact.js | 2 +- lib/client/dom.js | 6 ++---- lib/client/help.js | 9 +++------ lib/client/key.js | 2 +- lib/client/konsole.js | 2 +- lib/client/markdown.js | 20 +++++--------------- lib/client/menu.js | 4 +--- lib/client/terminal.js | 2 +- lib/client/upload.js | 8 ++------ 11 files changed, 19 insertions(+), 44 deletions(-) diff --git a/lib/client.js b/lib/client.js index e0319b88..687ff37d 100644 --- a/lib/client.js +++ b/lib/client.js @@ -54,9 +54,7 @@ var Util, DOM, CloudFunc, join; } if (panelChanged || isRefresh) - imgPosition = { - top: true - }; + imgPosition = 'top'; Images.show.load(imgPosition); diff --git a/lib/client/config.js b/lib/client/config.js index be3b30bb..7cfa8552 100644 --- a/lib/client/config.js +++ b/lib/client/config.js @@ -11,9 +11,7 @@ var CloudCmd, Util, DOM, io; Images = DOM.Images, Events = DOM.Events, showLoad = function() { - Images.show.load({ - top: true - }); + Images.show.load('top'); }, Element, INPUT = 'INPUT', diff --git a/lib/client/contact.js b/lib/client/contact.js index 66e82de5..56b7a3a6 100644 --- a/lib/client/contact.js +++ b/lib/client/contact.js @@ -34,7 +34,7 @@ var CloudCmd, Util, DOM, olark; function load(callback) { var path = DIR + 'contact/olark.js'; - Images.show.load({top: true}); + Images.show.load('top'); DOM.load.js(path, callback); } diff --git a/lib/client/dom.js b/lib/client/dom.js index 411a2b7a..94709db9 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -438,7 +438,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; name = file.name, path = dir + name; - Images.show.load({top: true}); + Images.show.load('top'); Images.setProgress(0, name); DOM.RESTful.write(path, file, callback); @@ -1609,9 +1609,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; if (name === '..') { Dialog.alert('No files selected!'); } else { - Images.show.load({ - top:true - }); + Images.show.load('top'); if (!data) to = Dialog.prompt(msg, to); diff --git a/lib/client/help.js b/lib/client/help.js index fe6f589a..ad66def7 100644 --- a/lib/client/help.js +++ b/lib/client/help.js @@ -10,10 +10,7 @@ var CloudCmd, Util, DOM; Help = this; function init() { - Images.show.load({ - top: true - }); - + Images.show.load('top'); Help.show(); } @@ -21,8 +18,8 @@ var CloudCmd, Util, DOM; CloudCmd .Markdown .show('/HELP.md', { - topLoad : true, - relative: true + positionLoad : 'top', + relative : true }); }; diff --git a/lib/client/key.js b/lib/client/key.js index 3fb19a12..dc1a6496 100644 --- a/lib/client/key.js +++ b/lib/client/key.js @@ -288,7 +288,7 @@ var CloudCmd, Util, DOM; break; case Key.TRA: - DOM.Images.show.load({top: true}); + DOM.Images.show.load('top'); if (shift) obj = CloudCmd.Terminal; diff --git a/lib/client/konsole.js b/lib/client/konsole.js index 741d57f7..65cfdfcd 100644 --- a/lib/client/konsole.js +++ b/lib/client/konsole.js @@ -15,7 +15,7 @@ var CloudCmd, Util, join, DOM, CloudFunc, Console; Konsole = this; function init() { - Images.show.load({top:true}); + Images.show.load('top'); Util.exec.series([ DOM.loadJquery, diff --git a/lib/client/markdown.js b/lib/client/markdown.js index b8a31ad0..062a13b1 100644 --- a/lib/client/markdown.js +++ b/lib/client/markdown.js @@ -12,9 +12,7 @@ var CloudCmd, Util, DOM; MD = this; function init() { - Images.show.load({ - top:true - }); + Images.show.load('top'); Util.exec.series([ CloudCmd.View, @@ -23,24 +21,16 @@ var CloudCmd, Util, DOM; } this.show = function(name, options) { - var o = options, + var o = options || optionsParam || {}, relativeQuery = '?relative'; if (!name) name = nameParam; - if (!options) - o = - options = optionsParam; + Images.show.load(o.positionLoad); - if (options) { - Images.show.load({ - top: o.topLoad - }); - - if (o.relative) - name += relativeQuery; - } + if (o.relative) + name += relativeQuery; Markdown.read(name, function(result) { var div = DOM.load({ diff --git a/lib/client/menu.js b/lib/client/menu.js index d54d545e..f54ada47 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -217,9 +217,7 @@ var CloudCmd, Util, DOM, CloudFunc, MenuIO; } function getFromPicker() { - Images.show.load({ - top: true - }); + Images.show.load('top'); CloudCmd.execFromModule('FilePicker', 'saveFile', function(name, data) { var path = DOM.getCurrentDirPath() + name; diff --git a/lib/client/terminal.js b/lib/client/terminal.js index 679980d2..d82602ae 100644 --- a/lib/client/terminal.js +++ b/lib/client/terminal.js @@ -42,7 +42,7 @@ var CloudCmd, Util, DOM, CloudFunc, Terminal, io; function show(callback) { if (!Loading) { - Images.show.load({top:true}); + Images.show.load('top'); if (!Element) { Element = DOM.load({ diff --git a/lib/client/upload.js b/lib/client/upload.js index aacfe3be..6fa445ab 100644 --- a/lib/client/upload.js +++ b/lib/client/upload.js @@ -12,9 +12,7 @@ var CloudCmd, Util, DOM; Upload = this; function init() { - Images.show.load({ - top: true - }); + Images.show.load('top'); Util.exec.series([ CloudCmd.View, @@ -23,9 +21,7 @@ var CloudCmd, Util, DOM; } this.show = function() { - Images.show.load({ - top: true - }); + Images.show.load('top'); Files.get('upload', function(error, data) { CloudCmd.View.show(data, {