diff options
| author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
| commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
| tree | e408be732a3eee71229bfc7dbf7cace998ce18de /js/code-editor | |
| parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
| parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
| download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/code-editor')
| -rw-r--r-- | js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html | 2 |
1 files changed, 1 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 2c91ca13..4448e1f1 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,7 +11,7 @@ | |||
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "codeCompleteCheck":{ | 13 | "codeCompleteCheck":{ |
| 14 | "prototype": "montage/ui/checkbox.reel", | 14 | "prototype": "montage/ui/input-checkbox.reel", |
| 15 | "properties": { | 15 | "properties": { |
| 16 | "element": {"#": "codeComplete"} | 16 | "element": {"#": "codeComplete"} |
| 17 | }, | 17 | }, |