From 6075916ef18dc4a8cbea41c941d2d0b519360262 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 26 Jun 2012 13:04:04 -0700
Subject: fixed code hinting and autocompletion bug

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../ui/code-editor-view-options.reel/code-editor-view-options.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html')

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..3d5df256 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
@@ -54,7 +54,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>-->
-- 
cgit v1.2.3


From 3391a8e6fd5df0d464edaffd98c2b3fde23acf5a Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Tue, 26 Jun 2012 16:03:56 -0700
Subject: refactored to move bindings to template

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 .../code-editor-view-options.reel/code-editor-view-options.html   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html')

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"}
             }
         },
 
-- 
cgit v1.2.3