Merge branch 'refs/heads/master-dom-architecture' into dom-architecture

3 files changed, 1 insertions, 59 deletions

diff --git a/js/document/templates/banner/index.html b/js/document/templates/banner/index.html
index 91ef06de..f1ee3d98 100755
--- a/js/document/templates/banner/index.html
+++ b/js/document/templates/banner/index.html
@@ -81,7 +81,7 @@
         
         <!-- TODO: Determine if loading Montage is always needed or if it could be done author-time or on file open -->
     
-        <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
+        <script type="text/javascript" data-package="../app" src="../../../../node_modules/montage/montage.js" data-ninja-template="true"></script>
 
         <script type="text/montage-serialization" data-ninja-template="true">
         {
diff --git a/js/document/templates/banner/main.js b/js/document/templates/banner/main.js
deleted file mode 100644
index d5ac88d5..00000000
--- a/js/document/templates/banner/main.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/* <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.Main = Montage.create(Component, {
-
-    hasTemplate: {
-        value: false
-    },
-
-    /**
-     * Adding window hooks to callback into this object from Ninja.
-     */
-    templateDidLoad: {
-        value: function(){
-            var self = this;
-            window.addComponent = function(element, data, callback) {
-                var component;
-
-                component = require.async(data.path)
-                    .then(function(component) {
-                        var componentRequire = component[data.name];
-                        var componentInstance = componentRequire.create();
-
-                        componentInstance.element = element;
-
-                        componentInstance.needsDraw = true;
-                        componentInstance.ownerComponent = self;
-
-                        callback(componentInstance, element);
-                    })
-                    .end();
-
-            };
-
-            // Dispatch event when this template has loaded.
-            /*
-            var newEvent = document.createEvent( "CustomEvent" );
-            newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
-            document.body.dispatchEvent( newEvent );
-            */
-
-        }
-    }
-});
\ No newline at end of file
diff --git a/js/document/templates/banner/package.json b/js/document/templates/banner/package.json
deleted file mode 100755
index d1e839dc..00000000
--- a/js/document/templates/banner/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-       "directories": {
-           "lib": ""
-       },
-       "mappings": {
-           "montage": "../../../../node_modules/montage/",
-           "montage-google": "../../../../node_modules/montage-google/"
-       }
-}
\ No newline at end of file