3 files changed, 87 insertions, 15 deletions

diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
index a406abdb..0cdf718c 100644
--- a/js/document/templates/app/main.js
+++ b/js/document/templates/app/main.js
@@ -8,12 +8,38 @@ var Montage = 			require("montage/core/core").Montage,
     Template =                  require("montage/ui/template").Template,
     TemplateCreator =   require("tools/template/template-creator").TemplateCreator;
 
+
+//var njmodelGet = function njmodelGet() {
+//    return (this.hasOwnProperty("_model") ? this._model: document.modelGenerator.call(this));
+//};
+//
+//Object.defineProperty(Object.prototype, "_model", {
+//    enumerable: false,
+//    value: null,
+//    writable: true
+//});
+//
+//Object.defineProperty(Object.prototype, "elementModel", {
+//    configurable: true,
+//    get: njmodelGet,
+//    set: function() {
+//    }
+//});
+
 exports.Main = Montage.create(Component, {
 
     hasTemplate: {
         value: false
     },
 
+    componentToInsert: {
+        value: null
+    },
+
+    firstDrawCallback: {
+        value: null
+    },
+
     /**
      * Adding window hooks to callback into this object from Ninja.
      */
@@ -24,6 +50,12 @@ exports.Main = Montage.create(Component, {
             window.addComponent = function(element, data, callback) {
                 var component;
 
+                if(!self.firstDrawCallback) {
+                    self.firstDrawCallback = {};
+                    self.firstDrawCallback.callback = data.firstDraw.cb;
+                    self.firstDrawCallback.context = data.firstDraw.ctx;
+                }
+
                 component = require.async(data.path)
                     .then(function(component) {
                         var componentRequire = component[data.name];
@@ -34,6 +66,9 @@ exports.Main = Montage.create(Component, {
                         componentInstance.needsDraw = true;
                         componentInstance.ownerComponent = self;
 
+                        self.componentToInsert = componentInstance;
+                        componentInstance.addEventListener("firstDraw", self, false);
+
                         callback(componentInstance, element);
                     })
                     .end();
@@ -47,15 +82,15 @@ exports.Main = Montage.create(Component, {
             var templateEvent = document.createEvent("CustomEvent");
             templateEvent.initCustomEvent("mjsTemplateReady", false, true);
             document.body.dispatchEvent(templateEvent);
-                        
-                        
-            // Dispatch event when this template has loaded.
-            /*
-            var newEvent = document.createEvent( "CustomEvent" );
-            newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
-            document.body.dispatchEvent( newEvent );
-            */
+        }
+    },
+
+    handleFirstDraw: {
+        value: function() {
+            this.firstDrawCallback.callback.call(this.firstDrawCallback.context, this.componentToInsert);
 
+            this.componentToInsert.removeEventListener("firstDraw", this, false);
+            this.componentToInsert = null;
         }
     }
 });
\ No newline at end of file
diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index f1ee3d98..08a998e5 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -74,9 +74,27 @@
         </style>
         
         <script type="text/javascript" data-ninja-template="true">
-                function getElement(x,y) {
-                return document.elementFromPoint(x,y);
-                }
+
+            function getElement(x,y) {
+                return document.elementFromPoint(x,y);
+            }
+
+            var njmodelGet = function njmodelGet() {
+                return (this.hasOwnProperty("_model") ? this._model: document.modelGenerator.call(this));
+            };
+
+            Object.defineProperty(Object.prototype, "_model", {
+                enumerable: false,
+                value: null,
+                writable: true
+            });
+
+            Object.defineProperty(Object.prototype, "elementModel", {
+                configurable: true,
+                get: njmodelGet,
+                set: function() {
+                }
+            });
         </script>
         
         <!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index 70187900..c74a7251 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -57,13 +57,32 @@
 
             .nj-element-highlight {
                  outline: 4px solid #ff0000;
-             }
+            }
         </style>
         
         <script type="text/javascript" data-ninja-template="true">
-                function getElement(x,y) {
-                return document.elementFromPoint(x,y);
-                }
+
+            function getElement(x,y) {
+                return document.elementFromPoint(x,y);
+            }
+
+            var njmodelGet = function njmodelGet() {
+                return (this.hasOwnProperty("_model") ? this._model: document.modelGenerator.call(this));
+            };
+
+            Object.defineProperty(Object.prototype, "_model", {
+                enumerable: false,
+                value: null,
+                writable: true
+            });
+
+            Object.defineProperty(Object.prototype, "elementModel", {
+                configurable: true,
+                get: njmodelGet,
+                set: function() {
+                }
+            });
+
         </script>
     
         <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>