diff options
| author | Jose Antonio Marquez | 2012-02-14 20:48:58 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-14 20:48:58 -0800 |
| commit | 39d95b0f26aa38fcad4bb388446232a16ee72644 (patch) | |
| tree | c208938eabfe85e33ccbbceb9f66ad780f70f62a /js/io/system | |
| parent | 68ce64a5a2f4a71b54d33916aaf1d57161302425 (diff) | |
| parent | ec14eff9831026600ba4cf71810444d54e143e04 (diff) | |
| download | ninja-39d95b0f26aa38fcad4bb388446232a16ee72644.tar.gz | |
Merge branch 'refs/heads/AnanyaFileIO' into FileIO
Diffstat (limited to 'js/io/system')
| -rwxr-xr-x | js/io/system/coreioapi.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js index 6dcd795e..507804fd 100755 --- a/js/io/system/coreioapi.js +++ b/js/io/system/coreioapi.js | |||
| @@ -1103,7 +1103,7 @@ window.hack = function (path) { | |||
| 1103 | uri = uri.replace(/^\s+|\s+$/g,""); // strip any leading or trailing spaces | 1103 | uri = uri.replace(/^\s+|\s+$/g,""); // strip any leading or trailing spaces |
| 1104 | 1104 | ||
| 1105 | //for local machine folder uri | 1105 | //for local machine folder uri |
| 1106 | isWindowsUri = /^([a-zA-Z]:)(\\[^<>:"/\\|?*]+)*\\?$/gi.test(uri); | 1106 | isWindowsUri = /^([a-zA-Z]:)([\\/][^<>:"/\\|?*]+)*[\\/]?$/gi.test(uri); |
| 1107 | isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix | 1107 | isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix |
| 1108 | status = isWindowsUri || isUnixUri; | 1108 | status = isWindowsUri || isUnixUri; |
| 1109 | if(isWindowsUri && isUnixUri){status = false;} | 1109 | if(isWindowsUri && isUnixUri){status = false;} |