Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

1 files changed, 54 insertions, 0 deletions

diff --git a/js/document/templates/montage-html/main.reel/main.js b/js/document/templates/montage-html/main.reel/main.js
new file mode 100644
index 00000000..567f481c
--- /dev/null
+++ b/js/document/templates/montage-html/main.reel/main.js
@@ -0,0 +1,54 @@
+/* <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(){
+            window.addComponent = this.addComponentToUserDocument;
+//            window.addBinding = this.addBindingToUserDocument;
+
+            // Dispatch event when this template has loaded.
+            var newEvent = document.createEvent( "CustomEvent" );
+            newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
+
+            document.body.dispatchEvent( newEvent );
+
+        }
+    },
+
+    // Adding components to the user document by using a async require.
+    addComponentToUserDocument:{
+        value: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.deserializedFromTemplate();
+                    componentInstance.needsDraw = true;
+
+                    callback(componentInstance, element);
+                })
+                .end();
+
+        }
+    }
+
+});
\ No newline at end of file