Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Bindables_GIO

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 @@
                 }
             },
 
-            "codeEditorController": {
-                "prototype": "js/controllers/code-editor-controller",
+            "codeEditorWrapper": {
+                "prototype": "js/code-editor/code-editor-wrapper",
                 "bindings": {
-                    "currentDocument": {"<-": "@documentList.selectedObjects.0"},
-                    "automaticCodeComplete": {"<-": "@editorViewOptions.codeCompleteCheck.disabled"}
+                    "currentDocument": {"<-": "@documentList.selectedObjects.0"}
                 }
             },
 
@@ -394,7 +393,7 @@
                     "ioMediator":           {"@": "ioMediator"},
                     "timeline":             {"@": "timeline"},
                     "mainMenuController":   {"@": "mainMenuController"},
-                    "codeEditorController": {"@": "codeEditorController"},
+                    "codeEditorWrapper": {"@": "codeEditorWrapper"},
                     "objectsController":    {"@": "objectsController"},
                     "rightPanelContainer":  {"#": "rightPanelContainer" },
                     "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, {
         serializable: true
     },
 
-    codeEditorController: {
+    codeEditorWrapper: {
         value: null,
         serializable: true
     },