Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts: js/components/layout/bread-crumb.reel/bread-crumb.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
author: Jonathan Duran 2012-04-24 08:49:52 -0700
committer: Jonathan Duran 2012-04-24 08:49:52 -0700
commit: 02414d5b25a53f7939d77c83ed550aad41e1f382 (patch)
tree: d918b1a78a44bddb55676d767069016db9fcda18 /js/document/templates
parent: 47488a6ff1b7fc32e2485b3dd82afe207b936b35 (diff)
parent: 55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff)
download: ninja-02414d5b25a53f7939d77c83ed550aad41e1f382.tar.gz
4 files changed, 125 insertions, 0 deletions
diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css
new file mode 100755
index 00000000..db069d4e
--- /dev/null
+++ b/js/document/templates/montage-web/default_html.css
@@ -0,0 +1,19 @@
+/* <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> */
+* {
+    -webkit-transition-duration: 0s !important;
+    -webkit-animation-duration: 0s !important;
+    -webkit-animation-name: none !important;
+}
+.active-element-outline {
+  outline: #adff2f solid 2px;
+}
+.nj-preset-transition {
+    -webkit-transition: all 450ms linear !important;
+}
+\ No newline at end of file
diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html
new file mode 100755
index 00000000..90b0f7fd
--- /dev/null
+++ b/js/document/templates/montage-web/index.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<!-- <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> -->
+ 
+<html>
+        <head>
+        
+                <title>Ninja Prototype</title>
+        <link href="default_html.css" id="nj-stage-stylesheet" rel="stylesheet" type="text/css" media="screen"/>
+    
+        <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script>
+    
+        <script type="text/javascript">
+                function getElement(x,y) {
+                return document.elementFromPoint(x,y);
+                }
+        </script>
+        <script type="text/montage-serialization">
+        {
+            "owner": {
+                "module": "main.reel",
+                "name": "Main"
+            }
+        }
+        </script>
+        <style>
+            div {
+                width: 4000px;
+                height: 300px;
+                background: red;
+            }
+        </style>
+        </head>
+        <body>
+                
+                <div>IPSUM</div>
+        </body>
+</html>
+\ No newline at end of file
diff --git a/js/document/templates/montage-web/main.reel/main.js b/js/document/templates/montage-web/main.reel/main.js
new file mode 100644
index 00000000..d5ac88d5
--- /dev/null
+++ b/js/document/templates/montage-web/main.reel/main.js
@@ -0,0 +1,49 @@
+/* <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/montage-web/package.json b/js/document/templates/montage-web/package.json
new file mode 100755
index 00000000..c8bc02fb
--- /dev/null
+++ b/js/document/templates/montage-web/package.json
@@ -0,0 +1,8 @@
+{
+       "directories": {
+           "lib": ""
+       },
+       "mappings": {
+           "montage": "../../../../node_modules/montage/"
+       }
+}
+\ No newline at end of file
author	Jonathan Duran	2012-04-24 08:49:52 -0700
committer	Jonathan Duran	2012-04-24 08:49:52 -0700
commit	02414d5b25a53f7939d77c83ed550aad41e1f382 (patch)
tree	d918b1a78a44bddb55676d767069016db9fcda18 /js/document/templates
parent	47488a6ff1b7fc32e2485b3dd82afe207b936b35 (diff)
parent	55e6d621b9555abac06ab4adff44dfe29a78ec4e (diff)
download	ninja-02414d5b25a53f7939d77c83ed550aad41e1f382.tar.gz

diff --git a/js/document/templates/montage-web/default_html.css b/js/document/templates/montage-web/default_html.css new file mode 100755 index 00000000..db069d4e --- /dev/null +++ b/js/document/templates/montage-web/default_html.css
@@ -0,0 +1,19 @@
	1	/* <copyright>
	2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
	3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
	4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
	5	</copyright> */
	6
	7	* {
	8	-webkit-transition-duration: 0s !important;
	9	-webkit-animation-duration: 0s !important;
	10	-webkit-animation-name: none !important;
	11	}
	12
	13	.active-element-outline {
	14	outline: #adff2f solid 2px;
	15	}
	16
	17	.nj-preset-transition {
	18	-webkit-transition: all 450ms linear !important;
	19	} \ No newline at end of file


diff --git a/js/document/templates/montage-web/index.html b/js/document/templates/montage-web/index.html new file mode 100755 index 00000000..90b0f7fd --- /dev/null +++ b/js/document/templates/montage-web/index.html
@@ -0,0 +1,49 @@
	1	<!DOCTYPE html>
	2	<!-- <copyright>
	3	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
	4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
	5	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
	6	</copyright> -->
	7
	8	<html>
	9
	10	<head>
	11
	12	<title>Ninja Prototype</title>
	13
	14	<link href="default_html.css" id="nj-stage-stylesheet" rel="stylesheet" type="text/css" media="screen"/>
	15
	16	<script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script>
	17
	18	<script type="text/javascript">
	19	function getElement(x,y) {
	20	return document.elementFromPoint(x,y);
	21	}
	22	</script>
	23
	24	<script type="text/montage-serialization">
	25	{
	26	"owner": {
	27	"module": "main.reel",
	28	"name": "Main"
	29	}
	30	}
	31	</script>
	32
	33	<style>
	34	div {
	35	width: 4000px;
	36	height: 300px;
	37	background: red;
	38	}
	39	</style>
	40
	41	</head>
	42
	43	<body>
	44
	45	<div>IPSUM</div>
	46
	47	</body>
	48
	49	</html> \ No newline at end of file


diff --git a/js/document/templates/montage-web/main.reel/main.js b/js/document/templates/montage-web/main.reel/main.js new file mode 100644 index 00000000..d5ac88d5 --- /dev/null +++ b/js/document/templates/montage-web/main.reel/main.js
@@ -0,0 +1,49 @@
	1	/* <copyright>
	2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
	3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
	4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
	5	</copyright> */
	6	var Montage = require("montage/core/core").Montage,
	7	Component = require("montage/ui/component").Component;
	8
	9	exports.Main = Montage.create(Component, {
	10
	11	hasTemplate: {
	12	value: false
	13	},
	14
	15	/**
	16	* Adding window hooks to callback into this object from Ninja.
	17	*/
	18	templateDidLoad: {
	19	value: function(){
	20	var self = this;
	21	window.addComponent = function(element, data, callback) {
	22	var component;
	23
	24	component = require.async(data.path)
	25	.then(function(component) {
	26	var componentRequire = component[data.name];
	27	var componentInstance = componentRequire.create();
	28
	29	componentInstance.element = element;
	30
	31	componentInstance.needsDraw = true;
	32	componentInstance.ownerComponent = self;
	33
	34	callback(componentInstance, element);
	35	})
	36	.end();
	37
	38	};
	39
	40	// Dispatch event when this template has loaded.
	41	/*
	42	var newEvent = document.createEvent( "CustomEvent" );
	43	newEvent.initCustomEvent( "userTemplateDidLoad", false, true );
	44	document.body.dispatchEvent( newEvent );
	45	*/
	46
	47	}
	48	}
	49	}); \ No newline at end of file


diff --git a/js/document/templates/montage-web/package.json b/js/document/templates/montage-web/package.json new file mode 100755 index 00000000..c8bc02fb --- /dev/null +++ b/js/document/templates/montage-web/package.json
@@ -0,0 +1,8 @@
	1	{
	2	"directories": {
	3	"lib": ""
	4	},
	5	"mappings": {
	6	"montage": "../../../../node_modules/montage/"
	7	}
	8	} \ No newline at end of file