aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-17 11:29:09 -0700
committerValerio Virgillito2012-07-17 11:29:09 -0700
commit58e86247524cc2d545bd6884f1b5c9fdba3b9164 (patch)
tree53305d354fce502ee39378babf47ace6c91ce2fd /js
parent0f0cffd4df85e7adf5081fe66c768c70b2ead9b3 (diff)
parent4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
downloadninja-58e86247524cc2d545bd6884f1b5c9fdba3b9164.tar.gz
Merge branch 'refs/heads/master' into v0.7.1
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