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

3 files changed, 1 insertions, 68 deletions

diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index 24159841..933df157 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -62,7 +62,7 @@
                 }
         </script>
     
-        <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/html/main.js b/js/document/templates/html/main.js
deleted file mode 100644
index ffa3fab2..00000000
--- a/js/document/templates/html/main.js
+++ /dev/null
@@ -1,57 +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,
-    Template =                  require("montage/ui/template").Template,
-    TemplateCreator =   require("tools/template/template-creator").TemplateCreator;
-
-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();
-
-            };
-            //
-            window.mjsTemplateCreator = TemplateCreator;
-            //
-            window.mjsTemplate = Template;
-                        
-                        
-            // 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/html/package.json b/js/document/templates/html/package.json
deleted file mode 100755
index 4f36090a..00000000
--- a/js/document/templates/html/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-       "directories": {
-           "lib": ""
-       },
-       "mappings": {
-           "montage": "../../../../node_modules/montage/",
-           "tools": "../../../../node_modules/tools/",
-           "montage-google": "../../../../node_modules/montage-google/"
-       }
-}
\ No newline at end of file