diff options
| author | Jon Reid | 2012-07-17 16:03:14 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-07-17 16:03:14 -0700 |
| commit | 42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3 (patch) | |
| tree | 67deeb8c5b34aacc91f737cc64a3bc9ef1f4f05f /js | |
| parent | a12cabc16273ffe04af4bce1f7438dc9326efa89 (diff) | |
| parent | b4b3e45d6684e77d361b4f8ca5be4889428320c5 (diff) | |
| download | ninja-42a51e0c27f2e2cd825d07b3af5ec05b0e5208b3.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js')
| -rw-r--r-- | js/code-editor/code-editor-wrapper.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/code-editor/code-editor-wrapper.js b/js/code-editor/code-editor-wrapper.js index 07381244..57fe4d3a 100644 --- a/js/code-editor/code-editor-wrapper.js +++ b/js/code-editor/code-editor-wrapper.js | |||
| @@ -114,6 +114,8 @@ exports.CodeEditorWrapper = Montage.create(Component, { | |||
| 114 | deserializedFromTemplate: { | 114 | deserializedFromTemplate: { |
| 115 | value: function() { | 115 | value: function() { |
| 116 | this.codeEditor = CodeMirror; | 116 | this.codeEditor = CodeMirror; |
| 117 | |||
| 118 | //todo:load all avaialable themes | ||
| 117 | } | 119 | } |
| 118 | }, | 120 | }, |
| 119 | 121 | ||