aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-28 11:07:04 -0700
committerValerio Virgillito2012-03-28 11:07:04 -0700
commita25e50a429dfa87522ed7616dcae7b472f3c785c (patch)
tree11c85d77a9bf8ff5781891e4c2b0e2edd6e7351e /js/ninja.reel/ninja.html
parent119f5902df944f2f92ea18de0ab634df7a55d879 (diff)
parentbfd796e47c856c6620dc4b32ac6c710d4a493d3a (diff)
downloadninja-a25e50a429dfa87522ed7616dcae7b472f3c785c.tar.gz
Merge pull request #145 from ericguzman/PresetsPI
Presets - Adding presets controller
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 7b5a6e52..ead7f576 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -316,6 +316,11 @@
316 "name": "StylesController" 316 "name": "StylesController"
317 }, 317 },
318 318
319 "presetsController": {
320 "module": "js/controllers/presets-controller",
321 "name": "PresetsController"
322 },
323
319 "filePickerController": { 324 "filePickerController": {
320 "module": "js/io/ui/file-picker/file-picker-controller", 325 "module": "js/io/ui/file-picker/file-picker-controller",
321 "name": "FilePickerController" 326 "name": "FilePickerController"
@@ -364,6 +369,7 @@
364 "popupManager": {"@": "popupManager1"}, 369 "popupManager": {"@": "popupManager1"},
365 "colorController": {"@": "colorController1"}, 370 "colorController": {"@": "colorController1"},
366 "stylesController": {"@": "stylesController"}, 371 "stylesController": {"@": "stylesController"},
372 "presetsController": {"@": "presetsController"},
367 "filePickerController": {"@": "filePickerController"}, 373 "filePickerController": {"@": "filePickerController"},
368 "newFileController": {"@": "newFileController"}, 374 "newFileController": {"@": "newFileController"},
369 "coreIoApi": {"@": "coreIoApi1"}, 375 "coreIoApi": {"@": "coreIoApi1"},