diff options
| author | Jon Reid | 2012-06-20 15:05:26 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-20 15:05:26 -0700 |
| commit | 6e6c146f6e59c3942076b5d2f46b2962cc709926 (patch) | |
| tree | aa6becc1e97aecbe6fb43aa33770def3c3de227d /js/code-editor | |
| parent | f887a74a7d03a2008a2c43d455a2b3e9223028af (diff) | |
| parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
| download | ninja-6e6c146f6e59c3942076b5d2f46b2962cc709926.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into timeline-local
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 | }, |