From 3d16dd81374036bd3a0ce08907ad71df9ff0ce7d Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 13 Mar 2014 05:48:09 -0400 Subject: [PATCH] refactor(rest) delete, Markdown.read: rm query --- lib/client/dom.js | 4 ++-- lib/client/help.js | 6 ++++-- lib/client/rest.js | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/client/dom.js b/lib/client/dom.js index dd234bc9..c6cdcd6e 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -644,7 +644,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; Dialog.alert('No files selected!'); if (ret) - RESTful.delete(path, names, function() { + RESTful.delete(path + query, names, function() { var Storage = DOM.Storage, dirPath = CurrentInfo.dirPath, dir = CloudFunc.rmLastSlash(dirPath); @@ -655,7 +655,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; DOM.deleteCurrent(current); Storage.remove(dir); - }, query); + }); return ret; }; diff --git a/lib/client/help.js b/lib/client/help.js index a81f9f9d..0dd0c692 100644 --- a/lib/client/help.js +++ b/lib/client/help.js @@ -23,11 +23,13 @@ var CloudCmd, Util, DOM; } this.show = function() { + var name = '/HELP.md?relative'; + Images.showLoad({ top:true }); - Markdown.read('/HELP.md', function(result) { + Markdown.read(name, function(result) { var div = DOM.anyload({ name : 'div', className : 'help', @@ -37,7 +39,7 @@ var CloudCmd, Util, DOM; Images.hideLoad(); CloudCmd.View.show(div); - }, '?relative'); + }); }; this.hide = function() { diff --git a/lib/client/rest.js b/lib/client/rest.js index 9f74ddd3..c89e7df1 100644 --- a/lib/client/rest.js +++ b/lib/client/rest.js @@ -13,10 +13,10 @@ var Util, DOM, CloudCmd; function RESTfulProto() { var Images = DOM.Images; - this.delete = function(url, data, callback, query) { + this.delete = function(url, data, callback) { sendRequest({ method : 'DELETE', - url : CloudFunc.FS + url + (query || ''), + url : CloudFunc.FS + url, data : data, callback : callback, imgPosition : { top: !!data } @@ -79,10 +79,10 @@ var Util, DOM, CloudCmd; }; this.Markdown = { - read : function(url, callback, query) { + read : function(url, callback) { sendRequest({ method : 'GET', - url : '/markdown' + url+ (query || ''), + url : '/markdown' + url, callback : callback, imgPosition : { top: true }, doNotLog : true