aboutsummaryrefslogtreecommitdiff
path: root/js/io/system
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-21 18:04:27 -0800
committerJose Antonio Marquez2012-02-21 18:04:27 -0800
commit25e6a03cf8af4bd0496a8b21c82332d76ddd9fff (patch)
tree9b4ef3a716139d5259261cae97e8603a1d33a91f /js/io/system
parent20dc41e571ddec6b781653fac43e2ca34026937d (diff)
parent2f24dafec79583547fe663d5a387d8ef15aae3bf (diff)
downloadninja-25e6a03cf8af4bd0496a8b21c82332d76ddd9fff.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Diffstat (limited to 'js/io/system')
-rwxr-xr-xjs/io/system/coreioapi.js31
-rw-r--r--js/io/system/ninjalibrary.js2
-rw-r--r--js/io/system/ninjalibrary.json3
3 files changed, 3 insertions, 33 deletions
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index a75b59bb..2051da43 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -1096,37 +1096,6 @@ exports.CoreIoApi = Montage.create(Component, {
1096 } 1096 }
1097 return status; 1097 return status;
1098 } 1098 }
1099 },
1100
1101 ////////////////////////////////////////////////////////////////////
1102 /***
1103 * check if the file exists
1104 */
1105 checkFileExists:{
1106 value: function(fileName, folderUri, fileType){
1107 var uri = "", response=null, status=true;
1108
1109 //prepare absolute uri
1110 if(/[^/\\]$/g.test(folderUri)){
1111 folderUri = folderUri + "/";
1112 }
1113
1114 if(!!fileType && (fileName.lastIndexOf(fileType) !== (fileName.length - fileType.length))){
1115 fileName = fileName+fileType;
1116 }
1117
1118 uri = ""+folderUri+fileName;
1119
1120 response = this.fileExists({"uri":uri});
1121 if(!!response && response.success && (response.status === 204)){
1122 status = true;
1123 }else if(!!response && response.success && (response.status === 404)){
1124 status = false;
1125 }else{
1126 status = false;
1127 }
1128 return status;
1129 }
1130 } 1099 }
1131 //////////////////////////////////////////////////////////////////// 1100 ////////////////////////////////////////////////////////////////////
1132}); 1101});
diff --git a/js/io/system/ninjalibrary.js b/js/io/system/ninjalibrary.js
index 8c58883a..960bdef9 100644
--- a/js/io/system/ninjalibrary.js
+++ b/js/io/system/ninjalibrary.js
@@ -145,6 +145,8 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
145 synchronize: { 145 synchronize: {
146 enumerable: true, 146 enumerable: true,
147 value: function(chromeLibs, chrome) { 147 value: function(chromeLibs, chrome) {
148 //TODO: Remove
149 window.wipeLibrary = this.deleteLibraries.bind(this);
148 // 150 //
149 this.chromeApi = chrome; 151 this.chromeApi = chrome;
150 // 152 //
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 05e0a427..a61c30d1 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,7 +1,6 @@
1{ 1{
2 "libraries": [ 2 "libraries": [
3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.6.0.0"}, 3 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.6.0.0"},
4 {"name": "Assets", "path": "/assets/descriptor.json", "version": "0.5.0.0"}, 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.0.1"}
5 {"name": "RDGE", "path": "/js/helper-classes/RDGE/rdge-compiled.js", "version": "0.5.0.0", "file": "rdge-compiled.js"}
6 ] 5 ]
7} \ No newline at end of file 6} \ No newline at end of file