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

2 files changed, 11 insertions, 1 deletions

diff --git a/js/document/document-html.js b/js/document/document-html.js
index c60a12a2..b5684dc5 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -62,6 +62,8 @@ exports.HtmlDocument = Montage.create(Component, {
                 parentContainer: {value: document.getElementById("iframeContainer")}, //Saving reference to parent container of all views (should be changed to buckets approach
                 views: {value: {'design': DesignDocumentView.create(), 'code': null}} //TODO: Add code view logic
             });
+            //Calling the any init routines in the model
+            this.model.init();
             //Initiliazing views and hiding
                 if (this.model.views.design.initialize(this.model.parentContainer)) {
                         //Hiding iFrame, just initiliazing
diff --git a/js/document/models/html.js b/js/document/models/html.js
index fd42d4de..0fe33990 100755
--- a/js/document/models/html.js
+++ b/js/document/models/html.js
@@ -18,6 +18,14 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
+        //Called by the document immidiately after the model is created
+    init: {
+        value:function() {
+                //Creating instance of the webGL helper for this model
+                this.webGlHelper = webGlDocumentHelper.create();
+                }           
+    },
+    ////////////////////////////////////////////////////////////////////
     //
     selection: {
         value: []
@@ -57,7 +65,7 @@ exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
     ////////////////////////////////////////////////////////////////////
         //
         webGlHelper: {
-        value: webGlDocumentHelper
+        value: null
     },
     ////////////////////////////////////////////////////////////////////
         //