aboutsummaryrefslogtreecommitdiff
path: root/js/code-editor/code-editor-wrapper.js
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 11:42:09 -0700
committerJonathan Duran2012-07-17 11:42:09 -0700
commitb4b3e45d6684e77d361b4f8ca5be4889428320c5 (patch)
tree2156d9920ea1b7db49ed6460545fea7cda121bae /js/code-editor/code-editor-wrapper.js
parent4a87ff575693509ac578d46af26fa137c0dc3f58 (diff)
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-b4b3e45d6684e77d361b4f8ca5be4889428320c5.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Diffstat (limited to 'js/code-editor/code-editor-wrapper.js')
-rw-r--r--js/code-editor/code-editor-wrapper.js2
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