diff options
author | Jose Antonio Marquez | 2012-02-04 22:35:28 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-04 22:35:28 -0800 |
commit | d1fda420f898965b5dd57de0c8340886cef308a8 (patch) | |
tree | 2fad2e890c1142a7eee30c45710f1f0b78adfdde /js/ninja.reel/ninja.html | |
parent | cc64cfc5aaa570ed9f72545fc135200019d62311 (diff) | |
parent | 45cfffd9261ab1aa714554c584f0d0d8fe627c91 (diff) | |
download | ninja-d1fda420f898965b5dd57de0c8340886cef308a8.tar.gz |
Merge branch 'refs/heads/AnanyaFileIO' into FileIO
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 0f23a18f..37c269e0 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
@@ -216,6 +216,11 @@ | |||
216 | "name": "ElementMediator" | 216 | "name": "ElementMediator" |
217 | }, | 217 | }, |
218 | 218 | ||
219 | "ioMediator": { | ||
220 | "module": "js/mediators/io-mediator", | ||
221 | "name": "IoMediator" | ||
222 | }, | ||
223 | |||
219 | "undocontroller1": { | 224 | "undocontroller1": { |
220 | "module": "js/controllers/undo-controller", | 225 | "module": "js/controllers/undo-controller", |
221 | "name": "UndoController" | 226 | "name": "UndoController" |
@@ -285,7 +290,8 @@ | |||
285 | "filePickerController": {"@": "filePickerController"}, | 290 | "filePickerController": {"@": "filePickerController"}, |
286 | "newFileController": {"@": "newFileController"}, | 291 | "newFileController": {"@": "newFileController"}, |
287 | "coreIoApi": {"@": "coreIoApi1"}, | 292 | "coreIoApi": {"@": "coreIoApi1"}, |
288 | "documentBar": {"@": "documentBar"} | 293 | "documentBar": {"@": "documentBar"}, |
294 | "ioMediator": {"@": "ioMediator"} | ||
289 | } | 295 | } |
290 | } | 296 | } |
291 | 297 | ||