1 files changed, 24 insertions, 4 deletions

diff --git a/js/document/views/design.js b/js/document/views/design.js
index 5af24546..3d11e138 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -7,7 +7,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ////////////////////////////////////////////////////////////////////////
 //
 var Montage =                   require("montage/core/core").Montage,
-        BaseDocumentView =      require("js/document/views/base").BaseDocumentView;
+        BaseDocumentView =      require("js/document/views/base").BaseDocumentView,
+    ElementModel =      require("js/models/element-model");
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.DesignDocumentView = Montage.create(BaseDocumentView, {
@@ -23,6 +24,11 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     },
     ////////////////////////////////////////////////////////////////////
         //
+    _viewCallback: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
     _template: {
         value: null
     },
@@ -126,12 +132,13 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
     ////////////////////////////////////////////////////////////////////
         //
         render: {
-        value: function (callback, template) {
+        value: function (callback, template, viewCallback) {
                 //TODO: Remove, this is a temp patch for webRequest API gate
                 this.application.ninja.documentController.redirectRequests = false;
                 //Storing callback for dispatch ready
                 this._callback = callback;
                 this._template = template;
+            this._viewCallback = viewCallback;
                 //Adding listener to know when template is loaded to then load user content
                 this.iframe.addEventListener("load", this.onTemplateLoad.bind(this), false);
                 //TODO: Add source parameter and root (optional)
@@ -286,6 +293,10 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                                         }
                                 }
                         }
+
+            // Assign the modelGenerator reference from the template to our own modelGenerator
+            this.document.modelGenerator = ElementModel.modelGenerator;
+
                 //Checking for script tags then parsing check for montage and webgl
             if (scripttags.length > 0) {
                 //Checking and initializing webGL
@@ -294,6 +305,9 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                 this.initMontage(scripttags);
             } else {
                 //Else there is not data to parse
+                if(this._viewCallback) {
+                    this._viewCallback.viewCallback.call(this._viewCallback.context);
+            }
             }
             //TODO: Verify appropiate location for this operation
                 if (this._template && this._template.type === 'banner') {
@@ -309,8 +323,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                 for (var n in orgNodes) {
                         if (orgNodes[n].getAttribute) orgNodes[n].setAttribute('data-ninja-node', 'true');
                 }
-                //Initiliazing document model
-                document.application.njUtils.makeElementModel(this.documentRoot, "Body", "body");
+                
                 //Makign callback if specified
                 if (this._callback) this._callback();
         }
@@ -415,6 +428,7 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         //
     initMontage: {
         value: function (scripttags) {
+            var self = this;
                 //
                 this.iframe.contentWindow.document.body.addEventListener('mjsTemplateReady', function () {
                         //Initializing template with user's seriliazation
@@ -426,6 +440,12 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
                                         //Forcing draw on components
                                         template._deserializer._objects[c].needsDraw = true;
                                 }
+
+                    // Now call the view callback
+                    if(self._viewCallback) {
+                        self._viewCallback.viewCallback.call(self._viewCallback.context);
+                    }
+
                         });
                 }.bind(this), false);
         }