Merge branch 'refs/heads/ninjainternalmaster' into Timeline-local-kruti

1 files changed, 7 insertions, 3 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>-->