diff options
author | Jose Antonio Marquez | 2012-06-28 09:50:28 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-28 09:50:28 -0700 |
commit | ee1adbcc33932bc27966c02b159a3ab06966d4a5 (patch) | |
tree | a9d5ff91681aa06bf26cb62994461a58d3f80005 /js/ninja.reel/ninja.html | |
parent | ca1e79d4dc36a55c47b6f8cb92069eafc95383b5 (diff) | |
parent | 299ad041ab8f8669b3688e5ce74df5213d82ade6 (diff) | |
download | ninja-ee1adbcc33932bc27966c02b159a3ab06966d4a5.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/ninja.reel/ninja.html')
-rwxr-xr-x | js/ninja.reel/ninja.html | 9 |
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"}, |