3 files changed, 56 insertions, 26 deletions

diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
index 68d77f90..aeaf604c 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
@@ -22,11 +22,6 @@
     vertical-align: middle;
 }
 
-.viewOptions .autoCodeComplete input{
-    width: 1em;
-    height: 1em;
-}
-
 .viewOptions .autoCodeComplete .disabled{
     color:#515151;
 }
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
index 3d5df256..9871525b 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html
@@ -11,12 +11,13 @@
     <script type="text/montage-serialization">
     {
         "codeCompleteCheck":{
-            "prototype": "montage/ui/input-checkbox.reel",
+            "prototype": "montage/ui/native/input-checkbox.reel",
             "properties": {
                 "element": {"#": "codeComplete"}
             },
             "bindings": {
-                "disabled": {"<-": "@owner.autocomplete"}
+                "disabled": {"<-": "@owner.autocomplete"},
+                "checked": {"<->": "@owner.automaticCodeHint"}
             }
         },
 
@@ -29,6 +30,9 @@
                 "stepSize" :10,
                 "acceptableUnits" : ["%"],
                 "units" : "%"
+            },
+            "bindings": {
+                "value": {"<->": "@owner.zoomFactor"}
             }
         },
 
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
index 04b509a6..6c983867 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
@@ -36,6 +36,21 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
         }
     },
 
+    _codeEditorWrapper:{
+        value: null
+    },
+
+    codeEditorWrapper:{
+        get : function() {
+            return this._codeEditorWrapper;
+        },
+        set : function(value) {
+            if(this._codeEditorWrapper !== value){
+                this._codeEditorWrapper = value;
+            }
+        }
+    },
+
     _visible: {
         value: false
     },
@@ -97,6 +112,35 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
         serializable: true
     },
 
+    _zoomFactor:{
+        value: 100
+    },
+
+    zoomFactor:{
+        get: function(){
+            return this._zoomFactor;
+        },
+        set: function(value){
+            this._zoomFactor = value;
+            if(this.codeEditorWrapper){this.codeEditorWrapper.handleZoom(value)};
+        }
+    },
+
+    _automaticCodeHint:{
+        value: false
+    },
+
+    automaticCodeHint:{
+        get: function(){
+            return this._automaticCodeHint;
+        },
+        set: function(value){
+            this._automaticCodeHint = value;
+            //additing additional meta properties on the editor
+            this._currentDocument.model.views.code.editor.automaticCodeHint = value;
+        }
+    },
+
     themeSelect: {
         value: null,
         serializable: true
@@ -114,19 +158,6 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
             this.uncomment.addEventListener("click", this.handleUncomment.bind(this), false);
             this.themeSelect.addEventListener("change", this.handleThemeSelection.bind(this), false);
             this.shortKeys.addEventListener("click", this.handleShortKeys.bind(this), false);
-
-            Object.defineBinding(this.zoomHottext , "value", {
-              boundObject: this.application.ninja.codeEditorController,
-              boundObjectPropertyPath: "zoomFactor",
-              oneway : false
-            });
-
-            Object.defineBinding(this.codeCompleteCheck , "checked", {
-              boundObject: this.application.ninja.codeEditorController,
-              boundObjectPropertyPath: "automaticCodeComplete",
-              oneway : false
-            });
-
         }
     },
 
@@ -143,8 +174,6 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
             } else {
                 this.autoCompleteLabel.classList.remove("disabled");
             }
-
-            this.codeCompleteCheck.checked = false;
         }
     },
 
@@ -163,20 +192,22 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
 
     handleComment:{
         value: function(evt){
-            this.application.ninja.codeEditorController.commentSelection(true);
+            if(this.codeEditorWrapper){this.codeEditorWrapper.commentSelection(true)};
         }
     },
 
     handleUncomment:{
         value: function(evt){
-            this.application.ninja.codeEditorController.commentSelection(false);
+            if(this.codeEditorWrapper){this.codeEditorWrapper.commentSelection(false)};
         }
     },
 
     handleThemeSelection:{
         value: function(evt){
-            this.application.ninja.codeEditorController.editorTheme = this.themeSelect.options[this.themeSelect.selectedIndex].value;
-            this.application.ninja.codeEditorController.handleThemeSelection();
+            if(this.codeEditorWrapper){
+                this.codeEditorWrapper.editorTheme = this.themeSelect.options[this.themeSelect.selectedIndex].value;
+                this.codeEditorWrapper.handleThemeSelection();
+            }
         }
     },