Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/properties.reel/properties.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

2 files changed, 71 insertions, 0 deletions

diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
new file mode 100644
index 00000000..a406abdb
--- /dev/null
+++ b/js/document/templates/app/main.js
@@ -0,0 +1,61 @@
+/* <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;
+            //
+            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 );
+            */
+
+        }
+    }
+});
\ No newline at end of file
diff --git a/js/document/templates/app/package.json b/js/document/templates/app/package.json
new file mode 100755
index 00000000..4f36090a
--- /dev/null
+++ b/js/document/templates/app/package.json
@@ -0,0 +1,10 @@
+{
+       "directories": {
+           "lib": ""
+       },
+       "mappings": {
+           "montage": "../../../../node_modules/montage/",
+           "tools": "../../../../node_modules/tools/",
+           "montage-google": "../../../../node_modules/montage-google/"
+       }
+}
\ No newline at end of file