X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=File.js;h=2726e0ebd5aea9feaaee9243ad3cbe543d9f6c8c;hb=0f114f80caed505f45d0b377b61cc4333462b99a;hp=a7d58f7d3e4eb0b3a9c7b0e648b4468902b005a9;hpb=9dac304e6077eefd12fa2ff318820fae4edd1491;p=app.Builder.js diff --git a/File.js b/File.js index a7d58f7d3..2726e0ebd 100644 --- a/File.js +++ b/File.js @@ -25,29 +25,38 @@ var File = { // fixme - this needs a bitter location.. // they where in a string class before, but overriding String methods is not a good normally a good idea.. - rtrim : function (toTrim) { - if (this.substr(this.length - toTrim.length) == toTrim) { - return this.slice(0, this.length - toTrim.length); + rtrim : function (s,toTrim) { + if (s.substr(s.length - toTrim.length) == toTrim) { + return s.slice(0, s.length - toTrim.length); } - return this; + return s; + }, + trim : function (s,toTrim) { + var out = s.ltrim(toTrim); + out = out.rtrim(toTrim); + return out; }, - join : function () { - - - + ltrim : function (s, toTrim) { + if (s.substr(0, toTrim.length) == toTrim) { + return s.slice(toTrim.length); + } + return s; + }, + + join : function () { var out = ""; for (var i = 0; i < arguments.length; i++) { if (i == 0) { - out += arguments[i].rtrim(File.SEPARATOR); + out += this.rtrim(arguments[i], File.SEPARATOR); } else if (i == arguments.length - 1) { - out += File.SEPARATOR + arguments[i].ltrim(File.SEPARATOR); + out += File.SEPARATOR + this.ltrim(arguments[i], File.SEPARATOR); } else { - out += File.SEPARATOR + arguments[i].trim(File.SEPARATOR); + out += File.SEPARATOR + this.trim(arguments[i], File.SEPARATOR); } } return out;