diff options
author | Valerio Virgillito | 2012-02-14 15:40:33 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-14 15:40:33 -0800 |
commit | b85bfb54aaca3ccca3c1ef09115de925cd67f4e9 (patch) | |
tree | c8c9f9af761457e3c5f4c6774fb0fbba851df0c4 /js | |
parent | f059d6ae73b7e88bb6562cabe0f9ca00603647b8 (diff) | |
parent | bd18d46b502d3c216fbffbd9e0be4eefc07ca4ea (diff) | |
download | ninja-b85bfb54aaca3ccca3c1ef09115de925cd67f4e9.tar.gz |
Merge pull request #42 from ananyasen/IO-patch-ninja-internal-master-ananya
Patch to support / new file dialog's directory path, in windows
Diffstat (limited to 'js')
-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 614b0850..ea9627cc 100755 --- a/js/io/system/coreioapi.js +++ b/js/io/system/coreioapi.js | |||
@@ -1101,7 +1101,7 @@ window.hack = function (name, type) { | |||
1101 | uri = uri.replace(/^\s+|\s+$/g,""); // strip any leading or trailing spaces | 1101 | uri = uri.replace(/^\s+|\s+$/g,""); // strip any leading or trailing spaces |
1102 | 1102 | ||
1103 | //for local machine folder uri | 1103 | //for local machine folder uri |
1104 | isWindowsUri = /^([a-zA-Z]:)(\\[^<>:"/\\|?*]+)*\\?$/gi.test(uri); | 1104 | isWindowsUri = /^([a-zA-Z]:)([\\/][^<>:"/\\|?*]+)*[\\/]?$/gi.test(uri); |
1105 | isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix | 1105 | isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix |
1106 | status = isWindowsUri || isUnixUri; | 1106 | status = isWindowsUri || isUnixUri; |
1107 | if(isWindowsUri && isUnixUri){status = false;} | 1107 | if(isWindowsUri && isUnixUri){status = false;} |