diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js')
-rw-r--r-- | js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.js | 33 |
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: { |