aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html9
-rwxr-xr-xjs/ninja.reel/ninja.js2
2 files changed, 5 insertions, 6 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 1bd002ae..fcf6779d 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -346,11 +346,10 @@
346 } 346 }
347 }, 347 },
348 348
349 "codeEditorController": { 349 "codeEditorWrapper": {
350 "prototype": "js/controllers/code-editor-controller", 350 "prototype": "js/code-editor/code-editor-wrapper",
351 "bindings": { 351 "bindings": {
352 "currentDocument": {"<-": "@documentList.selectedObjects.0"}, 352 "currentDocument": {"<-": "@documentList.selectedObjects.0"}
353 "automaticCodeComplete": {"<-": "@editorViewOptions.codeCompleteCheck.disabled"}
354 } 353 }
355 }, 354 },
356 355
@@ -386,7 +385,7 @@
386 "ioMediator": {"@": "ioMediator"}, 385 "ioMediator": {"@": "ioMediator"},
387 "timeline": {"@": "timeline"}, 386 "timeline": {"@": "timeline"},
388 "mainMenuController": {"@": "mainMenuController"}, 387 "mainMenuController": {"@": "mainMenuController"},
389 "codeEditorController": {"@": "codeEditorController"}, 388 "codeEditorWrapper": {"@": "codeEditorWrapper"},
390 "rightPanelContainer": {"#": "rightPanelContainer" }, 389 "rightPanelContainer": {"#": "rightPanelContainer" },
391 "panelSplitter": {"@": "splitter3"}, 390 "panelSplitter": {"@": "splitter3"},
392 "timelineSplitter": {"@": "splitter4"}, 391 "timelineSplitter": {"@": "splitter4"},
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 61cd2487..0d355eaa 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -137,7 +137,7 @@ exports.Ninja = Montage.create(Component, {
137 serializable: true 137 serializable: true
138 }, 138 },
139 139
140 codeEditorController: { 140 codeEditorWrapper: {
141 value: null, 141 value: null,
142 serializable: true 142 serializable: true
143 }, 143 },