Merge branch 'refs/heads/Ninja-Internal' into TempPromptUI

3 files changed, 9 insertions, 5 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index 8874c34b..aded9241 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -107,6 +107,12 @@ exports.HtmlDocument = Montage.create(Component, {
     },
     handleViewReady: {
         value: function() {
+            // TODO: Find a better way to initialize this property
+            // Assign the domContainer to be the document root on open
+            if(typeof this.model.domContainer !== "undefined") {
+                this.model.domContainer = this.model.documentRoot;
+            }
+
             //Making callback after view is loaded
             this.loaded.callback.call(this.loaded.context, this);
         }
diff --git a/js/document/models/base.js b/js/document/models/base.js
index 0fd609c3..8ff52132 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -66,6 +66,9 @@ exports.BaseDocumentModel = Montage.create(Component, {
     _selection: {
         value: []
     },
+    domContainer: {
+        value: null
+    },
     ////////////////////////////////////////////////////////////////////
     //
     selection: {
diff --git a/js/document/models/html.js b/js/document/models/html.js
index 7064c6e3..4a232ee1 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -27,11 +27,6 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
                 this.libs = {montage: false, canvas: false, montageId: null, canvasId: null};
                 }           
     },
-    ////////////////////////////////////////////////////////////////////
-    //
-    selectionContainer: {
-        value: []
-    },
         ////////////////////////////////////////////////////////////////////
         //
     draw3DGrid: {