diff options
author | Valerio Virgillito | 2012-02-17 15:24:49 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-17 15:24:49 -0800 |
commit | 7789a48fab2b1541ef7ac1b94e14b3f8dccbb4ff (patch) | |
tree | 328e6fe964cfcbe6ff47ad6eecf81275da31364f /js/io | |
parent | 824927fde259c891a67f18311a8abc470cd48442 (diff) | |
parent | 041abe1f27378f095d3a6d5584559463959e0787 (diff) | |
download | ninja-7789a48fab2b1541ef7ac1b94e14b3f8dccbb4ff.tar.gz |
Merge pull request #53 from joseeight/FileIO
File IO local files webRequest redirect
Diffstat (limited to 'js/io')
-rw-r--r-- | js/io/system/ninjalibrary.js | 2 | ||||
-rw-r--r-- | js/io/system/ninjalibrary.json | 3 | ||||
-rwxr-xr-x | js/io/ui/cloudpopup.reel/cloudpopup.html | 2 |
3 files changed, 4 insertions, 3 deletions
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 |
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html index 2c1c169a..e58041ec 100755 --- a/js/io/ui/cloudpopup.reel/cloudpopup.html +++ b/js/io/ui/cloudpopup.reel/cloudpopup.html | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | <p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p> | 37 | <p>Connection to the Cloud Server was not detected. Please verify <br />that the server is running and the URL below is correct.</p> |
38 | 38 | ||
39 | <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="http://localhost:16380" /> | 39 | <label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="" /> |
40 | 40 | ||
41 | <button class="btn_test nj-skinned">Test</button> | 41 | <button class="btn_test nj-skinned">Test</button> |
42 | 42 | ||