aboutsummaryrefslogtreecommitdiff
path: root/js/code-editor/ui
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-13 13:51:39 -0700
committerNivesh Rajbhandari2012-06-13 13:51:39 -0700
commit263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch)
tree7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/code-editor/ui
parent1bb2778224982aea7b9781c6559bb659983a400f (diff)
parenta827f2769d75848c0ba0bff03a927c1f2706322b (diff)
downloadninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/code-editor/ui')
-rw-r--r--js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js33
1 files changed, 32 insertions, 1 deletions
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
index dabce6e0..13c9a705 100644
--- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
+++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js
@@ -52,6 +52,11 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
52 } 52 }
53 }, 53 },
54 54
55 autoCompleteLabel: {
56 value: null,
57 serializable: true
58 },
59
55 _autocomplete: { 60 _autocomplete: {
56 value: false 61 value: false
57 }, 62 },
@@ -73,7 +78,33 @@ exports.CodeEditorViewOptions = Montage.create(Component, {
73 }, 78 },
74 79
75 codeCompleteCheck: { 80 codeCompleteCheck: {
76 value: null 81 value: null,
82 serializable: true
83 },
84
85 zoomHottext: {
86 value: null,
87 serializable: true
88 },
89
90 comment: {
91 value: null,
92 serializable: true
93 },
94
95 uncomment: {
96 value: null,
97 serializable: true
98 },
99
100 themeSelect: {
101 value: null,
102 serializable: true
103 },
104
105 shortKeys: {
106 value: null,
107 serializable: true
77 }, 108 },
78 109
79 prepareForDraw: { 110 prepareForDraw: {