aboutsummaryrefslogtreecommitdiff
path: root/js/document/views
diff options
context:
space:
mode:
authorJonathan Duran2012-06-27 12:10:00 -0700
committerJonathan Duran2012-06-27 12:10:00 -0700
commitae2067a09cd9cd0ee60eac7bd35395bf81045626 (patch)
treef233ad47ef7ff229c8595d0b2ce36c3be7e7aec7 /js/document/views
parent0b0ad28a216d839aab37b2563912bb82f79768d1 (diff)
parent8351c3685a6db703d1940817abc71f92ef4e1bd4 (diff)
downloadninja-ae2067a09cd9cd0ee60eac7bd35395bf81045626.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/document/views')
-rwxr-xr-xjs/document/views/code.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/document/views/code.js b/js/document/views/code.js
index c8b2a23e..5467b0f1 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -114,7 +114,7 @@ exports.CodeDocumentView = Montage.create(BaseDocumentView, {
114 // 114 //
115 this.textViewContainer.style.display="block"; 115 this.textViewContainer.style.display="block";
116 // 116 //
117 this.editor = this.application.ninja.codeEditorController.createEditor(this, type, file.extension, textDocument); 117 this.editor = this.application.ninja.codeEditorWrapper.createEditor(this, type, file.extension, textDocument);
118 this.editor.hline = this.editor.setLineClass(0, "activeline"); 118 this.editor.hline = this.editor.setLineClass(0, "activeline");
119 } 119 }
120 }, 120 },