diff options
| author | hwc487 | 2012-06-13 14:04:09 -0700 |
|---|---|---|
| committer | hwc487 | 2012-06-13 14:04:09 -0700 |
| commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
| tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /js | |
| parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js')
110 files changed, 2102 insertions, 388 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, |