aboutsummaryrefslogtreecommitdiff
path: root/js/code-editor
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-20 15:04:25 -0700
committerArmen Kesablyan2012-06-20 15:04:25 -0700
commitfc818d31de267d2b77fda3b3029ad38d48698be8 (patch)
tree122ebf54d3378578c1ded4d786ba3940d4a911d2 /js/code-editor
parent120e31dcf1e11eed11ee430d77c438e7b073e9f8 (diff)
parentc9852665eadc1acb9c1c881d207c4bd9ef88805f (diff)
downloadninja-fc818d31de267d2b77fda3b3029ad38d48698be8.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
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 },