aboutsummaryrefslogtreecommitdiff
path: root/js/io/system
diff options
context:
space:
mode:
Diffstat (limited to 'js/io/system')
-rwxr-xr-xjs/io/system/coreioapi.js6
-rw-r--r--js/io/system/ninjalibrary.json2
2 files changed, 4 insertions, 4 deletions
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index ae249480..a06f45c6 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -217,7 +217,7 @@ exports.CoreIoApi = Montage.create(Component, {
217 value: function(serviceURL, path) { 217 value: function(serviceURL, path) {
218 var urlOut = path.replace(/\\/g,"/"); 218 var urlOut = path.replace(/\\/g,"/");
219 urlOut = urlOut.replace(/:/g,""); 219 urlOut = urlOut.replace(/:/g,"");
220 urlOut = encodeURI(urlOut); 220 urlOut = encodeURIComponent(urlOut);
221 //add leading / if not already there 221 //add leading / if not already there
222 if((urlOut.length > 0) && (urlOut.charAt(0) !== "/")){ 222 if((urlOut.length > 0) && (urlOut.charAt(0) !== "/")){
223 urlOut = "/" + urlOut; 223 urlOut = "/" + urlOut;
@@ -1085,14 +1085,14 @@ exports.CoreIoApi = Montage.create(Component, {
1085 isValidUri:{ 1085 isValidUri:{
1086 value: function(uri){ 1086 value: function(uri){
1087 var isWindowsUri=false, isUnixUri=false,status=false; 1087 var isWindowsUri=false, isUnixUri=false,status=false;
1088 if(uri !== ""){ 1088 if((uri !== null) && (uri !== "")){
1089 uri = uri.replace(/^\s+|\s+$/g,""); // strip any leading or trailing spaces 1089 uri = uri.replace(/^\s+|\s+$/g,""); // strip any leading or trailing spaces
1090 1090
1091 //for local machine folder uri 1091 //for local machine folder uri
1092 isWindowsUri = /^([a-zA-Z]:)([\\/][^<>:"/\\|?*]+)*[\\/]?$/gi.test(uri); 1092 isWindowsUri = /^([a-zA-Z]:)([\\/][^<>:"/\\|?*]+)*[\\/]?$/gi.test(uri);
1093 isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix 1093 isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix
1094 status = isWindowsUri || isUnixUri; 1094 status = isWindowsUri || isUnixUri;
1095 if(isWindowsUri && isUnixUri){status = false;} 1095 if((uri === "") || (isWindowsUri && isUnixUri)){status = false;}
1096 } 1096 }
1097 return status; 1097 return status;
1098 } 1098 }
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 29df45b8..285444b5 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
1{ 1{
2 "libraries": [ 2 "libraries": [
3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.7.0.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.7.0.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.1.2"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.4.0"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file