From 0f8b224f1538b37a0b9f3b871daa676c4d4cdb37 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Fri, 19 Dec 2014 09:48:04 -0500 Subject: [PATCH] refactor(dom) rm Util.rmStrOnce --- lib/client/dom.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/client/dom.js b/lib/client/dom.js index d282e509..3b69f4cf 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -521,8 +521,8 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; nameFile = name + '.gz'; } else if (operation.unpack) { op = RESTful.unpack; - nameDir = Util.rmStrOnce(name, '.tar.gz'); - nameFile = Util.rmStrOnce(name, '.gz'); + nameDir = name.replace('.tar.gz', ''); + nameFile = name.replace('.gz', ''); } Images.show.load(); @@ -658,7 +658,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; lHref = CloudFunc.rmLastSlash(lHref); lSubstr = lHref.substr(lHref , lHref.lastIndexOf('/')); - ret = Util.rmStrOnce(lHref, lSubstr + '/') || '/'; + ret = lHref.replace(lSubstr + '/', '') || '/'; return ret; }; @@ -766,7 +766,9 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; size = size.textContent; /* если это папка - возвращаем слово dir вместо размера*/ - ret = Util.rmStrOnce(size, ['<', '>']); + ['<', '>'].forEach(function(str) { + ret = size.replace(str); + }); return ret; }; @@ -1195,7 +1197,7 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; element = DOM.getByTag('a', current)[0], path = element.getAttribute('href'); - path = Util.rmStrOnce(path, CloudFunc.FS); + path = path.replace(CloudFunc.FS, ''); return path; };