diff options
author | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-11 11:17:41 -0700 |
commit | 278769df00ced8620fd73371e38fe2e43f07ca3b (patch) | |
tree | deb505c8a66b660eee1f17a2c6c4c575c7939f6f /js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html | |
parent | 555fd6efa605b937800b3979a4c68fa7eb8666ae (diff) | |
parent | 0f040acabfb7a4bf3138debec5aff869487ceb11 (diff) | |
download | ninja-278769df00ced8620fd73371e38fe2e43f07ca3b.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/document/models/html.js
js/document/views/design.js
js/ninja.reel/ninja.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html')
-rw-r--r-- | js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html | 6 |
1 files changed, 5 insertions, 1 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 14d6cb55..2c91ca13 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 | |||
@@ -14,6 +14,9 @@ | |||
14 | "prototype": "montage/ui/checkbox.reel", | 14 | "prototype": "montage/ui/checkbox.reel", |
15 | "properties": { | 15 | "properties": { |
16 | "element": {"#": "codeComplete"} | 16 | "element": {"#": "codeComplete"} |
17 | }, | ||
18 | "bindings": { | ||
19 | "disabled": {"<-": "@owner.autocomplete"} | ||
17 | } | 20 | } |
18 | }, | 21 | }, |
19 | 22 | ||
@@ -33,6 +36,7 @@ | |||
33 | "prototype": "js/code-editor/ui/code-editor-view-options.reel[CodeEditorViewOptions]", | 36 | "prototype": "js/code-editor/ui/code-editor-view-options.reel[CodeEditorViewOptions]", |
34 | "properties": { | 37 | "properties": { |
35 | "element": {"#": "viewOptions"}, | 38 | "element": {"#": "viewOptions"}, |
39 | "autoCompleteLabel": {"#": "autoCompleteLabel"}, | ||
36 | "codeCompleteCheck":{"@": "codeCompleteCheck"}, | 40 | "codeCompleteCheck":{"@": "codeCompleteCheck"}, |
37 | "zoomHottext":{"@":"zoomHottext"}, | 41 | "zoomHottext":{"@":"zoomHottext"}, |
38 | "comment":{"#":"comment"}, | 42 | "comment":{"#":"comment"}, |
@@ -50,7 +54,7 @@ | |||
50 | <input class="zoomFont" data-montage-id="zoomFont"/> | 54 | <input class="zoomFont" data-montage-id="zoomFont"/> |
51 | <div class="autoCodeComplete" > | 55 | <div class="autoCodeComplete" > |
52 | <input type="checkbox" data-montage-id="codeComplete" /> | 56 | <input type="checkbox" data-montage-id="codeComplete" /> |
53 | <span>Automatic Completion</span> | 57 | <label data-montage-id="autoCompleteLabel">Automatic Completion</label> |
54 | </div> | 58 | </div> |
55 | <div class="floatButtons"> | 59 | <div class="floatButtons"> |
56 | <!--<button disabled="disabled" id="format" value="format" class="nj-skinned format">Format</button>--> | 60 | <!--<button disabled="disabled" id="format" value="format" class="nj-skinned format">Format</button>--> |