diff --git a/ChangeLog b/ChangeLog index 888f6c01..2f90a374 100644 --- a/ChangeLog +++ b/ChangeLog @@ -578,7 +578,7 @@ generation of json of directory listing. * Added ability to rename files. -* Added RESTfull object to DOM for easy work with +* Added RESTful object to DOM for easy work with CloudCmd REST API. * Added help screen (on F1 after viewer loads). diff --git a/ChangeLog.rus.md b/ChangeLog.rus.md index 0952eb49..0f826bba 100644 --- a/ChangeLog.rus.md +++ b/ChangeLog.rus.md @@ -225,4 +225,4 @@ - Изминен принцип работы функции clickProcessing в меню, теперь он гораздо проще. - Произведен тотальный рефакторинг в файле commander.js, теперь там только генерация. структуры каталогов в формате json. -- добавлен обьект RESTfull в DOM модуль для упрощения работы с CloudCmd REST API. +- добавлен обьект RESTful в DOM модуль для упрощения работы с CloudCmd REST API. diff --git a/lib/client/dom.js b/lib/client/dom.js index d1faedf9..a2bc85a2 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -126,7 +126,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; }; }, - RESTfullProto = function() { + RESTfulProto = function() { this.delete = function(pUrl, pData, pCallBack, pQuery) { sendRequest({ method : 'DELETE', @@ -1106,7 +1106,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; lName = Dialog.prompt(lMsg, lName); if (lName) - RESTfull.save(lDir + lName + lType, null, CloudCmd.refresh); + RESTful.save(lDir + lName + lType, null, CloudCmd.refresh); }; /** @@ -1122,7 +1122,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; }; if (lName && lName !== '..') - RESTfull.zip(lFiles, CloudCmd.refresh); + RESTful.zip(lFiles, CloudCmd.refresh); }; @@ -1193,7 +1193,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; } if (lCurrent || lSelected) - RESTfull.delete(lUrl, lSelected, function() { + RESTful.delete(lUrl, lSelected, function() { if (n > 1) DOM.deleteSelected(lFiles); else @@ -1322,7 +1322,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; /* если это папка - возвращаем слово dir вместо размера*/ if (lName !== '..') - RESTfull.read(lLink, function(pSize) { + RESTful.read(lLink, function(pSize) { DOM.setCurrentSize(pSize, lCurrent); Util.exec(pCallBack, lCurrent); }, '?size'); @@ -1827,7 +1827,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; to : lDirPath + lTo }; - RESTfull.mv(lFiles, function() { + RESTful.mv(lFiles, function() { DOM.setCurrentName(lTo, lCurrent); }); } @@ -1855,7 +1855,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; to : lToPath }; - RESTfull.mv(lFiles, function() { + RESTful.mv(lFiles, function() { DOM.deleteCurrent(lCurrent); var lPanel = DOM.getPanel(true), @@ -1888,7 +1888,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; to : lToPath }; - RESTfull.cp(lFiles, function() { + RESTful.cp(lFiles, function() { var lPanel = DOM.getPanel(true), lDotDot = DOM.getById( '..(' + lPanel.id + ')'); @@ -1945,7 +1945,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; Events = Util.extendProto(EventsProto), Loader = Util.extendProto(LoaderProto), Images = Util.extendProto(ImagesProto), - RESTfull = Util.extendProto(RESTfullProto), + RESTful = Util.extendProto(RESTfulProto), Cache = Util.extendProto(CacheProto); DOMProto = DOMFunc.prototype = new CmdProto(); @@ -1956,7 +1956,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; DOMTree, Loader, { Events : Events, - RESTfull: RESTfull, + RESTful: RESTful, Images : Images, Cache : Cache } diff --git a/lib/client/edit.js b/lib/client/edit.js index 0bc1bf46..3d90ceb9 100644 --- a/lib/client/edit.js +++ b/lib/client/edit.js @@ -121,7 +121,7 @@ var CloudCmd, Util, DOM, CloudFunc, JsDiff, ace; var lPath = DOM.getCurrentPath(), lValue = Ace.getValue(); - DOM.RESTfull.save(lPath, lValue, Edit.showMessage); + DOM.RESTful.save(lPath, lValue, Edit.showMessage); } }); } diff --git a/lib/client/key.js b/lib/client/key.js index ef6ef032..b476a26a 100644 --- a/lib/client/key.js +++ b/lib/client/key.js @@ -112,7 +112,7 @@ var CloudCmd, Util, DOM; if ( DOM.isCurrentIsDir(lCurrent) ) lUrl += '?dir'; - DOM.RESTfull.delete(lUrl, function() { + DOM.RESTful.delete(lUrl, function() { DOM.deleteCurrent(lCurrent); }); } diff --git a/lib/client/listeners.js b/lib/client/listeners.js index 1e62bb42..3cce9608 100644 --- a/lib/client/listeners.js +++ b/lib/client/listeners.js @@ -232,7 +232,7 @@ var Util, DOM, CloudCmd; var path = dir + file.name, data = event.target.result; - DOM.RESTfull.save(path, data, CloudCmd.refresh); + DOM.RESTful.save(path, data, CloudCmd.refresh); }; }; diff --git a/lib/client/menu.js b/lib/client/menu.js index 3f1d8bfd..392d61bb 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -197,7 +197,7 @@ var CloudCmd, Util, DOM, CloudFunc, $; CloudCmd.execFromModule('FilePicker', 'saveFile', function(pName, pData){ var lPath = DOM.getCurrentDirPath() + pName; - DOM.RESTfull.save(lPath, pData, CloudCmd.refresh); + DOM.RESTful.save(lPath, pData, CloudCmd.refresh); }); } }; diff --git a/lib/server/rest.js b/lib/server/rest.js index de24eb86..6f13c3d1 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -1,4 +1,4 @@ -/* RESTfull module */ +/* RESTful module */ (function() { 'use strict';