aboutsummaryrefslogtreecommitdiff
path: root/js/document/document-text.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-08-07 13:27:19 -0700
committerNivesh Rajbhandari2012-08-07 13:27:19 -0700
commitda71ec8bf450438a4dc904cb348e548d01dfcb3f (patch)
tree36bae4f77a61c2c6690566c79d07f5b6bc2c3936 /js/document/document-text.js
parent923e760bf4a16baa82e81da6d38e671620664e8f (diff)
parent91c440a04f0108d05e663d1696027ca5601b25bc (diff)
downloadninja-da71ec8bf450438a4dc904cb348e548d01dfcb3f.tar.gz
Merge branch 'refs/heads/ninja-mqg734-master' into LineInCanvas
Diffstat (limited to 'js/document/document-text.js')
-rwxr-xr-xjs/document/document-text.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/document/document-text.js b/js/document/document-text.js
index 1fe43494..d06bdefb 100755
--- a/js/document/document-text.js
+++ b/js/document/document-text.js
@@ -51,13 +51,13 @@ exports.TextDocument = Montage.create(Component, {
51 //////////////////////////////////////////////////////////////////// 51 ////////////////////////////////////////////////////////////////////
52 // 52 //
53 init:{ 53 init:{
54 value: function(file, context, callback, view){ 54 value: function(file, context, callback, view, parentContainer){
55 // 55 //
56 var codeDocumentView = CodeDocumentView.create(), container = null; //TODO: Why is this initilzied to null? 56 var codeDocumentView = CodeDocumentView.create(), container = null; //TODO: Why is this initilzied to null?
57 //Creating instance of Text Document Model 57 //Creating instance of Text Document Model
58 this.model = Montage.create(TextDocumentModel,{ 58 this.model = Montage.create(TextDocumentModel,{
59 file: {value: file}, 59 file: {value: file},
60 parentContainer: {value: document.getElementById("codeViewContainer")}, //TODO: Remove reference to this element, should be dynamic 60 parentContainer: {value: parentContainer}, //TODO: Remove reference to this element, should be dynamic
61 views: {value: {'code': codeDocumentView, 'design': null}} //TODO: Add check if file might have design view, if so, then create it 61 views: {value: {'code': codeDocumentView, 'design': null}} //TODO: Add check if file might have design view, if so, then create it
62 }); 62 });
63 //TODO: Add design view logic 63 //TODO: Add design view logic