Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 10:45:47 +00:00
Code Issues Projects Releases Wiki Activity

changed removeStr to removeStrOneTime

Browse source
This commit is contained in:
coderaiser 2013-03-11 09:04:31 -04:00
parent bce99f2a65
commit dc809c1223
5 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cloudcmd.js
View file

@ -234,8 +234,9 @@
pParams.name = main.HTMLDIR + p.name + '.html';
lRet = main.sendFile( pParams );
}
else if( Util.isContainStr(p.name, FS) || Util.strCmp( p.name, '/') ){
if( Util.isContainStr(p.name, 'no-js/') ){
else if( Util.isContainStrAtBegin(p.name, FS) || Util.strCmp( p.name, '/') ){
if( Util.isContainStrAtBegin(p.name, FS + 'no-js/') ){
var lURL = Util.removeStr(pParams.name, 'no-js/');
return main.redirect(pParams, lURL);
}
@ -254,7 +255,7 @@
var lRet = main.checkParams(pParams);
if(lRet){
var p = pParams;
p.name = Util.removeStr(p.name, CloudFunc.FS) || main.SLASH;
p.name = Util.removeStrOneTime(p.name, CloudFunc.FS) || main.SLASH;
fs.stat(p.name, function(pError, pStat){
if(!pError)

8
lib/client/dom.js
View file

@ -470,7 +470,7 @@ var CloudCommander, Util,
if(lRet){
var lNum = pSrc.lastIndexOf('/') + 1,
lSub = pSrc.substr(pSrc, lNum),
lID = Util.removeStr(pSrc, lSub );
lID = Util.removeStrOneTime(pSrc, lSub );
/* убираем точки */
while(lID.indexOf('.') > 0)
@ -926,7 +926,7 @@ var CloudCommander, Util,
lHref = CloudFunc.removeLastSlash(lHref);
lSubstr = lHref.substr(lHref , lHref.lastIndexOf('/'));
lRet = Util.removeStr(lHref, lSubstr + '/') || '/';
lRet = Util.removeStrOneTime(lHref, lSubstr + '/') || '/';
return lRet;
};
@ -979,7 +979,7 @@ var CloudCommander, Util,
lSize = DOM.getByClass('size', lCurrent);
lSize = lSize[0].textContent;
/* если это папка - возвращаем слово dir вместо размера*/
lRet = Util.removeStr(lSize, ['<', '>']);
lRet = Util.removeStrOneTime(lSize, ['<', '>']);
return lRet;
};
@ -1211,7 +1211,7 @@ var CloudCommander, Util,
lPath = decodeURI(lPath);
/* убираем адрес хоста*/
lPath = Util.removeStr( lPath, [CloudCommander.HOST, CloudFunc.FS] );
lPath = Util.removeStrOneTime( lPath, [CloudCommander.HOST, CloudFunc.FS] );
return lPath;
};

3
lib/client/keyBinding.js
View file

@ -120,6 +120,9 @@ var CloudCommander, Util, DOM;
if(pEvent.shiftKey){
var lUrl = DOM.getCurrentPath(lCurrentFile);
if( DOM.isCurrentIsDir(lCurrentFile) )
lUrl += '?dir';
DOM.RESTfull.delete(lUrl, function(){
DOM.deleteCurrent(lCurrentFile);
});

4
lib/server/rest.js
View file

@ -34,7 +34,7 @@
lRet = Util.isContainStr(p.name, lAPIURL);
if( lRet ){
p.name = Util.removeStr(p.name, lAPIURL);
p.name = Util.removeStrOneTime(p.name, lAPIURL);
sendData( pParams);
}
}
@ -71,7 +71,7 @@
onFS(pParams);
else{
if(p.name[0] === '/')
p.command = Util.removeStr(p.name, '/');
p.command = Util.removeStrOneTime(p.name, '/');
switch(p.request.method){
case 'GET':

18
lib/util.js
View file

@ -247,6 +247,24 @@ Util = exports || {};
return lRet;
};
/**
* is pStr1 contains pStr2 at begin
* @param pStr1
* @param pStr2
*/
Util.isContainStrAtBegin = function(pStr1, pStr2){
var lRet;
if( Util.isString(pStr1) && Util.isString(pStr2) ){
var lLength = pStr2.length,
lSubStr = pStr1.substring(0, lLength);
lRet = lSubStr === pStr2;
}
return lRet;
};
/**
* function log pArg if it's not empty
* @param pArg