Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
author: Jonathan Duran 2012-07-17 09:30:22 -0700
committer: Jonathan Duran 2012-07-17 09:30:22 -0700
commit: 53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree: 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/components/layout/bread-crumb-button.reel/bread-crumb-button.html
parent: 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent: 5146f224258929415adf4a8022e492454b4e2476 (diff)
download: ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz
1 files changed, 76 insertions, 0 deletions
diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html
new file mode 100755
index 00000000..596975de
--- /dev/null
+++ b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!-- <copyright>
+Copyright (c) 2012, Motorola Mobility LLC.
+All Rights Reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</copyright> -->
+<html lang="en">
+    <head>
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <link rel="stylesheet" type="text/css" href="bread-crumb-button.css">
+        <script type="text/montage-serialization">
+            {
+                "owner": {
+                    "prototype": "js/components/layout/bread-crumb-button.reel",
+                    "properties": {
+                        "element": {"#": "breadcrumb_container"}
+                    }
+                },
+                "breadCrumbButton": {
+                    "prototype": "montage/ui/native/button.reel",
+                    "properties": {
+                        "element": {"#": "breadcrumb_button"}
+                    },
+                    "listeners": [
+                        {
+                            "type": "action",
+                            "listener": {"@": "owner"}
+                        }
+                    ],
+                    "bindings": {
+                        "label": {"<-": "@owner.label"},
+                        "value": {"<-": "@owner.value"}
+                    }
+                }
+            }
+        </script>
+    </head>
+    <body>
+        <div data-montage-id="breadcrumb_container" class="breadcrumbComp">
+            <button data-montage-id="breadcrumb_button" class="breadcrumbButton"></button>
+            <span class="breadcrumbTipMask"><span class="breadcrumbTip"></span></span>
+        </div>
+    </body>
+</html>
author	Jonathan Duran	2012-07-17 09:30:22 -0700
committer	Jonathan Duran	2012-07-17 09:30:22 -0700
commit	53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree	79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/components/layout/bread-crumb-button.reel/bread-crumb-button.html
parent	7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent	5146f224258929415adf4a8022e492454b4e2476 (diff)
download	ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz

diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html new file mode 100755 index 00000000..596975de --- /dev/null +++ b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html
@@ -0,0 +1,76 @@
	1	<!DOCTYPE html>
	2	<!-- <copyright>
	3	Copyright (c) 2012, Motorola Mobility LLC.
	4	All Rights Reserved.
	5
	6	Redistribution and use in source and binary forms, with or without
	7	modification, are permitted provided that the following conditions are met:
	8
	9	* Redistributions of source code must retain the above copyright notice,
	10	this list of conditions and the following disclaimer.
	11
	12	* Redistributions in binary form must reproduce the above copyright notice,
	13	this list of conditions and the following disclaimer in the documentation
	14	and/or other materials provided with the distribution.
	15
	16	* Neither the name of Motorola Mobility LLC nor the names of its
	17	contributors may be used to endorse or promote products derived from this
	18	software without specific prior written permission.
	19
	20	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
	21	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	22	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	23	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
	24	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	25	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	26	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	27	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	28	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	29	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
	30	POSSIBILITY OF SUCH DAMAGE.
	31	</copyright> -->
	32	<html lang="en">
	33	<head>
	34	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
	35	<link rel="stylesheet" type="text/css" href="bread-crumb-button.css">
	36
	37
	38	<script type="text/montage-serialization">
	39	{
	40	"owner": {
	41	"prototype": "js/components/layout/bread-crumb-button.reel",
	42	"properties": {
	43	"element": {"#": "breadcrumb_container"}
	44
	45	}
	46	},
	47
	48	"breadCrumbButton": {
	49	"prototype": "montage/ui/native/button.reel",
	50	"properties": {
	51	"element": {"#": "breadcrumb_button"}
	52	},
	53	"listeners": [
	54	{
	55	"type": "action",
	56	"listener": {"@": "owner"}
	57	}
	58	],
	59	"bindings": {
	60	"label": {"<-": "@owner.label"},
	61	"value": {"<-": "@owner.value"}
	62	}
	63	}
	64	}
	65	</script>
	66
	67	</head>
	68	<body>
	69
	70	<div data-montage-id="breadcrumb_container" class="breadcrumbComp">
	71	<button data-montage-id="breadcrumb_button" class="breadcrumbButton"></button>
	72	<span class="breadcrumbTipMask"><span class="breadcrumbTip"></span></span>
	73	</div>
	74
	75	</body>
	76	</html>