aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-09 11:46:14 -0700
committerValerio Virgillito2012-05-09 11:46:14 -0700
commit4d9832acbd78f82a63fba59187bd82a5afad8240 (patch)
tree1aa2e2a955b155279d0cd9391baf18760f4c1a94 /js/io
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-4d9832acbd78f82a63fba59187bd82a5afad8240.tar.gz
Squashed commit of google-components into master
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/io')
-rw-r--r--js/io/system/ninjalibrary.js28
-rw-r--r--js/io/system/ninjalibrary.json2
2 files changed, 13 insertions, 17 deletions
diff --git a/js/io/system/ninjalibrary.js b/js/io/system/ninjalibrary.js
index 201598fc..f4915a91 100644
--- a/js/io/system/ninjalibrary.js
+++ b/js/io/system/ninjalibrary.js
@@ -152,7 +152,8 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
152 // 152 //
153 this.chromeApi = chrome; 153 this.chromeApi = chrome;
154 // 154 //
155 var i, l, libs, libjson, xhr = new XMLHttpRequest(), tocopylibs = [], copied; 155// debugger;
156 var i, l, libs, libjson, xhr = new XMLHttpRequest(), tocopylibs = [];
156 //Getting known json list of libraries to copy to chrome 157 //Getting known json list of libraries to copy to chrome
157 xhr.open("GET", '/js/io/system/ninjalibrary.json', false); 158 xhr.open("GET", '/js/io/system/ninjalibrary.json', false);
158 xhr.send(); 159 xhr.send();
@@ -166,23 +167,18 @@ exports.NinjaLibrary = Montage.create(Object.prototype, {
166 if (chromeLibs.length > 0) { 167 if (chromeLibs.length > 0) {
167 // 168 //
168 for (i=0; chromeLibs[i]; i++) { 169 for (i=0; chromeLibs[i]; i++) {
169 copied = false;
170 for (var j in libs.libraries) { 170 for (var j in libs.libraries) {
171 if (String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase() === chromeLibs[i]) { 171 if (String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase() === chromeLibs[i]) {
172 copied = true; 172 //TODO: Remove, currently manually removing copied libraries
173 } 173 // //this.chromeApi.directoryDelete(chromeLibs[i]);
174 } 174 } else {
175 // 175 if (libs.libraries[j].file) {
176 if (!copied) { 176 tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path, file: libs.libraries[j].file});
177 if (libs.libraries[j].file) { 177 } else {
178 tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path, file: libs.libraries[j].file}); 178 tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path});
179 } else { 179 }
180 tocopylibs.push({name: String(libs.libraries[j].name+libs.libraries[j].version).toLowerCase(), path: libs.libraries[j].path}); 180 }
181 } 181 }
182 } else {
183 //TODO: Remove, currently manually removing copied libraries
184 //this.chromeApi.directoryDelete(chromeLibs[i]);
185 }
186 } 182 }
187 183
188 } else { 184 } else {
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index e236f2e0..f7b87a91 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.8.0.0"},
4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.5.0"} 4 {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.5.0"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file