3 files changed, 6 insertions, 20 deletions

diff --git a/js/document/document-text.js b/js/document/document-text.js
index 09525f4e..bb63f5f8 100755
--- a/js/document/document-text.js
+++ b/js/document/document-text.js
@@ -31,7 +31,6 @@ exports.TextDocument = Montage.create(Component, {
         enumerable: false,
         value : function(file, context, callback, view){
             var codeDocumentView = CodeDocumentView.create(), container = null;
-            codeDocumentView.initialize();
 
             //Creating instance of Text Document Model
             this.model = Montage.create(TextDocumentModel,{
@@ -40,6 +39,8 @@ exports.TextDocument = Montage.create(Component, {
                 views: {value: {'code': codeDocumentView, 'design': null}}
             });
 
+            codeDocumentView.initialize(this.model.parentContainer);
+
             codeDocumentView.textArea.value = file.content;
             codeDocumentView.initializeTextView(file, this);
 
diff --git a/js/document/models/text.js b/js/document/models/text.js
index d21666d0..fe02953c 100755
--- a/js/document/models/text.js
+++ b/js/document/models/text.js
@@ -59,7 +59,7 @@ exports.TextDocumentModel = Montage.create(BaseDocumentModel, {
                         success = true;
                 }
                 //
-                this.views.code.textParentContainer.removeChild(this.views.code.textViewContainer);
+                this.parentContainer.removeChild(this.views.code.textViewContainer);
                 this.views.code.restoreAllPanels();
                 this.views.code.showCodeViewBar(false);
                 this.views.code = null;
diff --git a/js/document/views/code.js b/js/document/views/code.js
index de12881c..711479a8 100755
--- a/js/document/views/code.js
+++ b/js/document/views/code.js
@@ -41,18 +41,6 @@ var CodeDocumentView = exports.CodeDocumentView = Montage.create(BaseDocumentVie
         get: function() {return this._textArea;},
         set: function(value) {this._textArea= value;}
     },
-
-     ////////////////////////////////////////////////////////////////////
-    //remove _extParentContainer after moving to bucket structure for documents
-    _textParentContainer: {
-        value: null
-    },
-    ////////////////////////////////////////////////////////////////////
-    //
-    textParentContainer: {
-        get: function() {return this._textParentContainer;},
-        set: function(value) {this._textParentContainer= value;}
-    },
     ////////////////////////////////////////////////////////////////////
     //
     _textViewContainer: {
@@ -71,15 +59,12 @@ var CodeDocumentView = exports.CodeDocumentView = Montage.create(BaseDocumentVie
      * Public method
      */
     initialize:{
-        value: function(){
-            //populate _textParentContainer
-            this.textParentContainer = document.getElementById("codeViewContainer");
-
+        value: function(parentContainer){
             //create contianer
             this.textViewContainer = document.createElement("div");
             //this.textViewContainer.id = "codemirror_" + uuid;
             this.textViewContainer.style.display = "block";
-            this.textParentContainer.appendChild(this.textViewContainer);
+            parentContainer.appendChild(this.textViewContainer);
 
             //create text area
             this.textArea = this.createTextAreaElement();
@@ -200,7 +185,7 @@ var CodeDocumentView = exports.CodeDocumentView = Montage.create(BaseDocumentVie
     applyTheme:{
         value:function(themeClass){
             //Todo: change for bucket structure of documents
-            this.textParentContainer.className = "codeViewContainer "+themeClass;
+            this.textViewContainer.className = "codeViewContainer "+themeClass;
         }
     }