aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
diff options
context:
space:
mode:
authorJonathan Duran2012-06-27 12:10:00 -0700
committerJonathan Duran2012-06-27 12:10:00 -0700
commitae2067a09cd9cd0ee60eac7bd35395bf81045626 (patch)
treef233ad47ef7ff229c8595d0b2ce36c3be7e7aec7 /js/ninja.reel/ninja.html
parent0b0ad28a216d839aab37b2563912bb82f79768d1 (diff)
parent8351c3685a6db703d1940817abc71f92ef4e1bd4 (diff)
downloadninja-ae2067a09cd9cd0ee60eac7bd35395bf81045626.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-xjs/ninja.reel/ninja.html9
1 files changed, 4 insertions, 5 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 94db0cac..5429e7d0 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
@@ -394,7 +393,7 @@
394 "ioMediator": {"@": "ioMediator"}, 393 "ioMediator": {"@": "ioMediator"},
395 "timeline": {"@": "timeline"}, 394 "timeline": {"@": "timeline"},
396 "mainMenuController": {"@": "mainMenuController"}, 395 "mainMenuController": {"@": "mainMenuController"},
397 "codeEditorController": {"@": "codeEditorController"}, 396 "codeEditorWrapper": {"@": "codeEditorWrapper"},
398 "objectsController": {"@": "objectsController"}, 397 "objectsController": {"@": "objectsController"},
399 "rightPanelContainer": {"#": "rightPanelContainer" }, 398 "rightPanelContainer": {"#": "rightPanelContainer" },
400 "panelSplitter": {"@": "splitter3"}, 399 "panelSplitter": {"@": "splitter3"},