diff options
| author | Ananya Sen | 2012-07-17 14:25:53 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-07-17 14:25:53 -0700 |
| commit | 09457e39532e9b35afb9c635266755bfcb9b488a (patch) | |
| tree | 665dcbd41377b98dcab15ff995e9434d9db1a462 /js | |
| parent | f2dbca782bbaca3bed96dff808693693ba083ea9 (diff) | |
| parent | 4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff) | |
| download | ninja-09457e39532e9b35afb9c635266755bfcb9b488a.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into copy-paste-bugfix
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 | ||