Merge branch 'master' into brushtool

Conflicts: js/controllers/elements/shapes-controller.js
author: Pushkar Joshi 2012-03-27 09:10:58 -0700
committer: Pushkar Joshi 2012-03-27 09:10:58 -0700
commit: 0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch)
tree: e778f2b9d5d525aa364360d5996536a0a06379bd /node_modules/montage/examples/feed-reader/map-example.reel
parent: 753244b4713243ab19ca246be674f0b45fb85b72 (diff)
parent: 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
download: ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz
3 files changed, 84 insertions, 0 deletions
diff --git a/node_modules/montage/examples/feed-reader/map-example.reel/main.css b/node_modules/montage/examples/feed-reader/map-example.reel/main.css
new file mode 100644
index 00000000..139597f9
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/map-example.reel/main.css
@@ -0,0 +1,2 @@
diff --git a/node_modules/montage/examples/feed-reader/map-example.reel/main.html b/node_modules/montage/examples/feed-reader/map-example.reel/main.html
new file mode 100644
index 00000000..889ca8d6
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/map-example.reel/main.html
@@ -0,0 +1,58 @@
+<!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>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Main Component</title>
+    <style type="text/css">
+                .map-container {
+                        width: 500px;
+                        height: 500px;
+                        position: relative;
+                }
+                
+                .montage-google-map {
+                        position: relative;
+                margin: 0;
+                padding: 0;
+                }
+    </style>
+    <script type="text/montage-serialization">
+        {
+            "owner": {
+                "module": "main.reel",
+                "name": "Main",
+                "properties": {
+                    "element": {"#": "main"}
+                }
+            },
+            "map": {
+                "prototype": "montage/ui/google/map.reel",
+                "properties": {
+                    "element": {"#": "map"}
+                }
+            }
+        }
+    </script>
+</head>
+<body>
+    <div id="main" class="main">
+        <p>Main component of application</p>
+                <div class="map-container">
+                <div id="map"></div>
+                </div>
+    </div>
+</body>
+</html>
diff --git a/node_modules/montage/examples/feed-reader/map-example.reel/main.js b/node_modules/montage/examples/feed-reader/map-example.reel/main.js
new file mode 100644
index 00000000..54b84425
--- /dev/null
+++ b/node_modules/montage/examples/feed-reader/map-example.reel/main.js
@@ -0,0 +1,24 @@
+/* <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, {
+    templateDidLoad: {
+        value: function() {
+            //console.log("main templateDidLoad")
+        }
+    },
+    prepareForDraw: {
+        value: function() {
+            //console.log("main prepareForDraw")
+        }
+    }
+});
author	Pushkar Joshi	2012-03-27 09:10:58 -0700
committer	Pushkar Joshi	2012-03-27 09:10:58 -0700
commit	0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch)
tree	e778f2b9d5d525aa364360d5996536a0a06379bd /node_modules/montage/examples/feed-reader/map-example.reel
parent	753244b4713243ab19ca246be674f0b45fb85b72 (diff)
parent	309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
download	ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz

diff --git a/node_modules/montage/examples/feed-reader/map-example.reel/main.css b/node_modules/montage/examples/feed-reader/map-example.reel/main.css new file mode 100644 index 00000000..139597f9 --- /dev/null +++ b/node_modules/montage/examples/feed-reader/map-example.reel/main.css
@@ -0,0 +1,2 @@
	1
	2


diff --git a/node_modules/montage/examples/feed-reader/map-example.reel/main.html b/node_modules/montage/examples/feed-reader/map-example.reel/main.html new file mode 100644 index 00000000..889ca8d6 --- /dev/null +++ b/node_modules/montage/examples/feed-reader/map-example.reel/main.html
@@ -0,0 +1,58 @@
	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	<html>
	8	<head>
	9	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
	10	<title>Main Component</title>
	11
	12	<style type="text/css">
	13
	14	.map-container {
	15	width: 500px;
	16	height: 500px;
	17	position: relative;
	18	}
	19
	20	.montage-google-map {
	21	position: relative;
	22	margin: 0;
	23	padding: 0;
	24	}
	25	</style>
	26
	27	<script type="text/montage-serialization">
	28	{
	29	"owner": {
	30	"module": "main.reel",
	31	"name": "Main",
	32	"properties": {
	33	"element": {"#": "main"}
	34	}
	35	},
	36
	37	"map": {
	38	"prototype": "montage/ui/google/map.reel",
	39	"properties": {
	40	"element": {"#": "map"}
	41	}
	42	}
	43	}
	44	</script>
	45
	46	</head>
	47	<body>
	48
	49	<div id="main" class="main">
	50	<p>Main component of application</p>
	51	<div class="map-container">
	52	<div id="map"></div>
	53	</div>
	54
	55	</div>
	56
	57	</body>
	58	</html>


diff --git a/node_modules/montage/examples/feed-reader/map-example.reel/main.js b/node_modules/montage/examples/feed-reader/map-example.reel/main.js new file mode 100644 index 00000000..54b84425 --- /dev/null +++ b/node_modules/montage/examples/feed-reader/map-example.reel/main.js
@@ -0,0 +1,24 @@
	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
	10	exports.Main = Montage.create(Component, {
	11
	12	templateDidLoad: {
	13	value: function() {
	14	//console.log("main templateDidLoad")
	15	}
	16	},
	17
	18	prepareForDraw: {
	19	value: function() {
	20	//console.log("main prepareForDraw")
	21	}
	22	}
	23
	24	});