Merge branch 'refs/heads/NINJAmaster' into TimelineUber

2 files changed, 58 insertions, 14 deletions

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 4448e1f1..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"}
             }
         },
 
@@ -54,7 +58,7 @@
         <input class="zoomFont" data-montage-id="zoomFont"/>
         <div class="autoCodeComplete" >
             <input type="checkbox" data-montage-id="codeComplete" />
-            <label data-montage-id="autoCompleteLabel">Automatic Completion</label>
+            <label data-montage-id="autoCompleteLabel">Auto Code Hints</label>
         </div>
         <div class="floatButtons">
             <!--<button disabled="disabled" id="format" value="format" class="nj-skinned format">Format</button>-->
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 13c9a705..5a33909c 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
@@ -31,11 +31,27 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
             } else {
                 this.visible = true;
                 this.autocomplete = !this.codeCompletionSupport[this._currentDocument.model.file.extension];
+                this._currentDocument.model.views.code.editor.automaticCodeHint = this.codeCompleteCheck.checked;
             }
 
         }
     },
 
+    _codeEditorWrapper:{
+        value: null
+    },
+
+    codeEditorWrapper:{
+        get : function() {
+            return this._codeEditorWrapper;
+        },
+        set : function(value) {
+            if(this._codeEditorWrapper !== value){
+                this._codeEditorWrapper = value;
+            }
+        }
+    },
+
     _visible: {
         value: false
     },
@@ -97,6 +113,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,13 +159,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
-            });
-
         }
     },
 
@@ -155,20 +193,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();
+            }
         }
     },