aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-07-17 14:01:12 -0700
committerJose Antonio Marquez2012-07-17 14:01:12 -0700
commitf40c8c58638da8fcd9a7abb06b8f2a4c6ba995bd (patch)
treecb1ff6a31b144fe4f584f778d5691f06362b227e /js
parent17d464e5bd224cdd8940855409359b411325f1df (diff)
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-f40c8c58638da8fcd9a7abb06b8f2a4c6ba995bd.tar.gz
Merge branch 'refs/heads/Ninja-Master' into Document
Diffstat (limited to '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