2 files changed, 53 insertions, 43 deletions

diff --git a/user-document-templates/montage-application-cloud/index.html b/user-document-templates/montage-application-cloud/index.html
index d1f9634d..0db684cc 100644
--- a/user-document-templates/montage-application-cloud/index.html
+++ b/user-document-templates/montage-application-cloud/index.html
@@ -24,8 +24,8 @@
         <script type="text/montage-serialization">
         {
             "owner": {
-                "module": "./appdelegate",
-                "name": "MyAppDelegate"
+                "module": "main.reel",
+                "name": "Main"
             }
         }
         </script>
diff --git a/user-document-templates/montage-application-cloud/appdelegate.js b/user-document-templates/montage-application-cloud/main.reel/main.js
index 3c21b46e..2e331cdc 100644
--- a/user-document-templates/montage-application-cloud/appdelegate.js
+++ b/user-document-templates/montage-application-cloud/main.reel/main.js
@@ -1,18 +1,28 @@
 /* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> */
 var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
-exports.MyAppDelegate = Montage.create(Component, {
+//var Button = ("montage/ui/button.reel").Button;
+
+exports.Main = Montage.create(Component, {
+
+    hasTemplate: {
+        value: false
+    },
+
+    /**
+     * Adding window hooks to callback into this object from Ninja.
+     */
     templateDidLoad: {
-                value: function(){
+        value: function(){
             window.addComponent = this.addComponentToUserDocument;
-            window.addBinding = this.addBindingToUserDocument;
+//            window.addBinding = this.addBindingToUserDocument;
 
+            // Dispatch event when this template has loaded.
             var newEvent = document.createEvent( "CustomEvent" );
             newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
 
@@ -22,16 +32,41 @@ exports.MyAppDelegate = Montage.create(Component, {
     },
 
     addComponentToUserDocument:{
-        value:function(containerElement, componentType){
+        value:function(containerElement, componentType, callback){
             var component = null;
-            switch(componentType){
+            switch(componentType.type){
                 case "Button":
-                    component = Button.create();
-                    component.element = containerElement;
-                    component.element.classList.add("text");
-                    component.value = "Button";
-                    component.needsDraw = true;
+
+                    var button = require.async(componentType.path)
+                    .then(function (button) {
+                        var buttonObj = button["Button"];
+                        var btIns = buttonObj.create();
+
+                        btIns.element = containerElement;
+                        btIns.deserializedFromTemplate();
+
+                        btIns.needsDraw = true;
+                        btIns.label = "Button";
+                        callback(btIns, containerElement);
+                    })
+                    .end();
+
                     break;
+                case "Textfield":
+                    var tf = require.async(componentType.path)
+                    .then(function (tf) {
+                        var buttonObj = tf["Textfield"];
+                        var btIns = buttonObj.create();
+
+                        btIns.element = containerElement;
+                        btIns.deserializedFromTemplate();
+
+                        btIns.needsDraw = true;
+                        btIns.value = "Button";
+                        callback(btIns, containerElement);
+                    })
+                    .end();
+                    break
                 case "Checkbox":
                     component = Checkbox.create();
                     component.element = containerElement;
@@ -115,11 +150,6 @@ exports.MyAppDelegate = Montage.create(Component, {
                     component.element = containerElement;
                     component.needsDraw = true;
                     break;
-                case "Textfield":
-                    component = Textfield.create();
-                    component.element = containerElement;
-                    component.needsDraw = true;
-                    break;
                 case "Toggle":
                     component = Toggle.create();
                     component.element = containerElement;
@@ -137,26 +167,6 @@ exports.MyAppDelegate = Montage.create(Component, {
             //console.log(component);
             return component;
         }
-    },
-    addBindingToUserDocument:{
-        value:function(boundComponent, boundValue, targetComponent, targetValue){
-            if(targetComponent[targetValue] != undefined && boundComponent[boundValue] != undefined){
-                Object.defineBinding(boundComponent, boundValue, {
-                    boundObject: targetComponent,
-                    boundObjectPropertyPath: targetValue,
-                    boundValueMutator: function(value) {
-                        return(value);
-                    }
-                });
-            } else {
-                if(targetComponent[targetValue] == undefined){
-                    console.log("Binding Fail - Component Property Not Found: " + targetValue);
-                    alert("Binding Failed - Component Property Not Found: " + targetValue)
-                } else if(boundComponent[boundValue] == undefined){
-                    console.log("Binding Fail - Component Property Not Found: " + boundValue);
-                    alert("Binding Failed - Component Property Not Found: " + boundValue);
-                }
-            }
-        }
     }
+
 });
\ No newline at end of file