aboutsummaryrefslogtreecommitdiff
path: root/js/io/system
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-20 15:40:04 -0800
committerValerio Virgillito2012-02-20 15:40:04 -0800
commitf6811b8b7e86bcae16f9278b5a7cfc1ea94e3909 (patch)
tree7d12d3aca26e15fac2072498d42e2f7478f72719 /js/io/system
parent7ec06098dcfa969017b73b91a1eec810d05775f8 (diff)
parentbd7bc833895391e4974b8746f31f63ba70689df3 (diff)
downloadninja-f6811b8b7e86bcae16f9278b5a7cfc1ea94e3909.tar.gz
Merge branch 'refs/heads/master' into nested-selection
Diffstat (limited to 'js/io/system')
-rw-r--r--js/io/system/ninjalibrary.js2
-rw-r--r--js/io/system/ninjalibrary.json3
2 files changed, 3 insertions, 2 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