diff --git a/lib/client/dom.js b/lib/client/dom.js index 70bb14de..4c6a62e2 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -773,19 +773,16 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; * @currentFile */ this.loadCurrentSize = function(callback, currentFile) { - var lRet, - RESTful = DOM.RESTful, - lCurrent = currentFile || this.getCurrentFile(), - lLink = this.getCurrentPath(lCurrent), - lName = this.getCurrentName(lCurrent); + var RESTful = DOM.RESTful, + current = currentFile || this.getCurrentFile(), + query = '?size', + link = this.getCurrentPath(current); - if (lName !== '..') - RESTful.read(lLink, function(pSize) { - DOM.setCurrentSize(pSize, lCurrent); - Util.exec(callback, lCurrent); - }, '?size'); - - return lRet; + if (name !== '..') + RESTful.read(link + query, function(size) { + DOM.setCurrentSize(size, current); + Util.exec(callback, current); + }); }; /** @@ -794,15 +791,12 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; * @currentFile */ this.loadCurrentHash = function(callback, currentFile) { - var lRet, - RESTful = DOM.RESTful, - lCurrent = currentFile || this.getCurrentFile(), - lLink = this.getCurrentPath(lCurrent), - lName = this.getCurrentName(lCurrent); + var RESTful = DOM.RESTful, + current = currentFile || this.getCurrentFile(), + query = '?hash', + link = this.getCurrentPath(current); - RESTful.read(lLink, callback, '?hash'); - - return lRet; + RESTful.read(link + query, callback); }; /** @@ -811,27 +805,24 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; * @currentFile */ this.loadCurrentTime = function(callback, currentFile) { - var lRet, - RESTful = DOM.RESTful, - lCurrent = currentFile || this.getCurrentFile(), - lLink = this.getCurrentPath(lCurrent), - lName = this.getCurrentName(lCurrent); + var RESTful = DOM.RESTful, + current = currentFile || this.getCurrentFile(), + query = '?time', + link = this.getCurrentPath(lCurrent); - RESTful.read(lLink, callback, '?time'); - - return lRet; + RESTful.read(link + query, callback); }; /** * set size * @currentFile */ - this.setCurrentSize = function(pSize, currentFile) { - var lCurrent = currentFile || this.getCurrentFile(), - lSizeElement = this.getByClass('size', lCurrent), - lSize = CloudFunc.getShortSize(pSize); + this.setCurrentSize = function(size, currentFile) { + var current = currentFile || this.getCurrentFile(), + sizeElement = this.getByClass('size', current), + sizeShort = CloudFunc.getShortSize(size); - lSizeElement.textContent = lSize; + sizeElement.textContent = sizeShort; }; diff --git a/lib/client/rest.js b/lib/client/rest.js index 1c4f81d6..bedbe7fb 100644 --- a/lib/client/rest.js +++ b/lib/client/rest.js @@ -33,10 +33,10 @@ var Util, DOM, CloudCmd; }); }; - this.read = function(url, callback, query) { + this.read = function(url, callback) { sendRequest({ method : 'GET', - url : CloudFunc.FS + url + (query || ''), + url : CloudFunc.FS + url, callback : callback }); };