diff options
author | Jon Reid | 2012-06-15 10:10:41 -0700 |
---|---|---|
committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/code-editor | |
parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/code-editor')
-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: { |