aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorAnanya Sen2012-07-18 12:26:08 -0700
committerAnanya Sen2012-07-18 12:26:08 -0700
commitd799a03a52fbf4eaad4e469fabbf84c9bf2cb41d (patch)
tree4aa07b2a39bff542c18f91a052c910e8ea55bc3a /js
parentf40c8c58638da8fcd9a7abb06b8f2a4c6ba995bd (diff)
downloadninja-d799a03a52fbf4eaad4e469fabbf84c9bf2cb41d.tar.gz
parameterize the parentContainer for text document
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-xjs/controllers/document-controller.js2
-rwxr-xr-xjs/document/document-text.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 5020e27d..ee7ca82c 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -356,7 +356,7 @@ exports.DocumentController = Montage.create(Component, {
356 break; 356 break;
357 default: 357 default:
358 //Open in code view 358 //Open in code view
359 Montage.create(TextDocument).init(file, this.application.ninja, this.application.ninja.openDocument, 'code'); 359 Montage.create(TextDocument).init(file, this.application.ninja, this.application.ninja.openDocument, 'code', document.getElementById("codeViewContainer"));
360 break; 360 break;
361 } 361 }
362 } 362 }
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