aboutsummaryrefslogtreecommitdiff
path: root/js/code-editor
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-20 16:47:37 -0700
committerJose Antonio Marquez2012-06-20 16:47:37 -0700
commit313a62245400e6c8cfa6d2f02c603cc7f01ddfc6 (patch)
treec207d1290be0e894a57b03098bbb7bbe5f2aee86 /js/code-editor
parent2496e0d0b0ac5f8c53b12de77f0feda69ce4a2f4 (diff)
parent392a559e90357d48c910a07617261483b2b45476 (diff)
downloadninja-313a62245400e6c8cfa6d2f02c603cc7f01ddfc6.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/code-editor')
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html2
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 },