aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorEric Guzman2012-06-27 15:29:41 -0700
committerEric Guzman2012-06-27 15:29:41 -0700
commit61a41e74154715b0b42a429158fa1f2a44d2eb9a (patch)
tree2084e8df8c40708c9cc15d53d921a20718c8f006 /js/ninja.reel
parent230a1a2f2848c27edf7d01f8d3a5585c8d0d4ac9 (diff)
parent07e7e2f28b863b0a4d139cc7e649a630b162e0da (diff)
downloadninja-61a41e74154715b0b42a429158fa1f2a44d2eb9a.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bindables_GIO
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 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"},
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index f1825b9a..859268a0 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 },