From d88cd4e9355d55f8f021b8547fd61455a8f76348 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 23 Dec 2013 14:37:31 +0000 Subject: [PATCH] refactor(cloudfunc) getJoinUrl --- lib/cloudfunc.js | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/lib/cloudfunc.js b/lib/cloudfunc.js index 4bc25afe..d9c7b3dd 100644 --- a/lib/cloudfunc.js +++ b/lib/cloudfunc.js @@ -51,14 +51,11 @@ var Util; this.getJoinURL = function(names) { var url, isContain, + regExp = new RegExp(',', 'g'), nameStr = names + ''; - - nameStr = Util.replaceStr(nameStr, ',', ':'); - isContain = Util.isContainStrAtBegin(nameStr, '/'); - - if (isContain) - nameStr = Util.removeStrOneTime(nameStr, '/'); - + + nameStr = nameStr.replace(regExp, ':'); + nameStr = this.removeFirstSlash(nameStr); url = JOIN + nameStr; return url; @@ -98,7 +95,17 @@ var Util; lRet = pPath.substr(pPath, lLengh); return lRet; - }; + }; + + this.removeFirstSlash = function(str) { + var ret = str, + isContain = Util.isContainStrAtBegin(str, '/'); + + if (isContain) + ret = Util.removeStrOneTime(str, '/'); + + return ret; + }; /** Функция возвращает заголовок веб страницы * @pPath