aboutsummaryrefslogtreecommitdiff
path: root/js/io/system
diff options
context:
space:
mode:
authorhwc4872012-03-23 13:49:03 -0700
committerhwc4872012-03-23 13:49:03 -0700
commit51478dbad8290f55eeab9efdfb8c2cbe24b12b10 (patch)
tree1524c53d027d1f2f8cbb759f61e4d73b52b00481 /js/io/system
parent31e924e1b8b8da8342b3ff2341c8284915486c0b (diff)
parentbc8b0c17023ddea6d77150694a777e104ef99cbc (diff)
downloadninja-51478dbad8290f55eeab9efdfb8c2cbe24b12b10.tar.gz
Merge branch 'montage-integration' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts: js/io/system/ninjalibrary.json
Diffstat (limited to 'js/io/system')
-rwxr-xr-xjs/io/system/coreioapi.js4
-rw-r--r--js/io/system/ninjalibrary.json2
2 files changed, 3 insertions, 3 deletions
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index f428a229..ae249480 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -393,12 +393,12 @@ exports.CoreIoApi = Montage.create(Component, {
393 xhr = new XMLHttpRequest(); 393 xhr = new XMLHttpRequest();
394 // 394 //
395 xhr.open("POST", serviceURL, false); 395 xhr.open("POST", serviceURL, false);
396 xhr.responseType = "arraybuffer"; 396 //xhr.responseType = "arraybuffer";
397 if(file.contentType && file.contentType.length) 397 if(file.contentType && file.contentType.length)
398 xhr.setRequestHeader("Content-Type", file.contentType); 398 xhr.setRequestHeader("Content-Type", file.contentType);
399 else 399 else
400 xhr.setRequestHeader("Content-Type", "text/plain"); 400 xhr.setRequestHeader("Content-Type", "text/plain");
401 401
402 if (file.contents) 402 if (file.contents)
403 xhr.send(file.contents); 403 xhr.send(file.contents);
404 else 404 else
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index a863a135..29df45b8 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.6.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.1.2"}
5 ] 5 ]
6} \ No newline at end of file 6} \ No newline at end of file