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>
author: Jonathan Duran 2012-05-31 08:54:48 -0700
committer: Jonathan Duran 2012-05-31 08:54:48 -0700
commit: f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch)
tree: 6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/panels/css-panel/css-style.reel/css-style.html
parent: 9253e2ce98d748edd8c3929f113a597923960387 (diff)
parent: d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff)
download: ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz
1 files changed, 87 insertions, 0 deletions
diff --git a/js/panels/css-panel/css-style.reel/css-style.html b/js/panels/css-panel/css-style.reel/css-style.html
new file mode 100644
index 00000000..00cebf39
--- /dev/null
+++ b/js/panels/css-panel/css-style.reel/css-style.html
@@ -0,0 +1,87 @@
+<!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 lang="en">
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <link href="css-style.css" type="text/css" rel="stylesheet" media="screen">
+    <script type="text/montage-serialization">
+        {
+            "owner": {
+                "prototype" : "js/panels/css-panel/css-style.reel",
+                "properties" : {
+                    "element" : {"#" : "container"},
+                    "addStyleButton": {"#": "add-style-button"},
+                    "propertyField": {"@": "property"},
+                    "valueField": {"@": "value"},
+                    "propertyNames" : {"@": "propertyNames"}
+                }
+            },
+            "propertyNames": {
+                "object": "js/panels/CSSPanel/css-property-name-list"
+            },
+            "checkbox": {
+                "prototype": "montage/ui/checkbox.reel",
+                "properties": {
+                    "element": {"#": "disable-checkbox"},
+                    "checked": true
+                },
+                "bindings": {
+                    "checked" : {"<<->": "@owner.enabled" }
+                }
+            },
+            "property": {
+                "prototype": "js/components/hintable.reel",
+                "properties": {
+                    "startOnEvent": "click",
+                    "element": {"#": "property"},
+                    "identifier": "property"
+                },
+                "bindings": {
+                    "value" : {"<-": "@owner.propertyText" }
+                },
+                "listeners": [
+                    {
+                        "type": "change",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "stop",
+                        "listener": {"@": "owner"}
+                    }
+                ]
+            },
+            "value": {
+                "prototype": "js/components/hintable.reel",
+                "properties": {
+                    "startOnEvent": "click",
+                    "element": {"#": "value"},
+                    "identifier": "value"
+                },
+                "bindings": {
+                    "value" : {"<-": "@owner.valueText" }
+                },
+                "listeners": [
+                    {
+                        "type": "change",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "stop",
+                        "listener": {"@": "owner"}
+                    }
+                ]
+            }
+        }
+    </script>
+</head>
+<body>
+<div data-montage-id="container" class="style-item"  spellcheck="false" draggable="false">
+    <input type="checkbox" data-montage-id="disable-checkbox"><dt data-montage-id="property" class="css-property"></dt><dd data-montage-id="value" class="css-value"></dd>
+    <button data-montage-id="add-style-button" class="add-style-button">Add</button>
+</div>
+</body>
+</html>
+\ No newline at end of file
author	Jonathan Duran	2012-05-31 08:54:48 -0700
committer	Jonathan Duran	2012-05-31 08:54:48 -0700
commit	f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch)
tree	6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/panels/css-panel/css-style.reel/css-style.html
parent	9253e2ce98d748edd8c3929f113a597923960387 (diff)
parent	d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff)
download	ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz

diff --git a/js/panels/css-panel/css-style.reel/css-style.html b/js/panels/css-panel/css-style.reel/css-style.html new file mode 100644 index 00000000..00cebf39 --- /dev/null +++ b/js/panels/css-panel/css-style.reel/css-style.html
@@ -0,0 +1,87 @@
	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 lang="en">
	8	<head>
	9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
	10	<link href="css-style.css" type="text/css" rel="stylesheet" media="screen">
	11	<script type="text/montage-serialization">
	12	{
	13	"owner": {
	14	"prototype" : "js/panels/css-panel/css-style.reel",
	15	"properties" : {
	16	"element" : {"#" : "container"},
	17	"addStyleButton": {"#": "add-style-button"},
	18	"propertyField": {"@": "property"},
	19	"valueField": {"@": "value"},
	20	"propertyNames" : {"@": "propertyNames"}
	21	}
	22	},
	23	"propertyNames": {
	24	"object": "js/panels/CSSPanel/css-property-name-list"
	25	},
	26	"checkbox": {
	27	"prototype": "montage/ui/checkbox.reel",
	28	"properties": {
	29	"element": {"#": "disable-checkbox"},
	30	"checked": true
	31	},
	32	"bindings": {
	33	"checked" : {"<<->": "@owner.enabled" }
	34	}
	35	},
	36	"property": {
	37	"prototype": "js/components/hintable.reel",
	38	"properties": {
	39	"startOnEvent": "click",
	40	"element": {"#": "property"},
	41	"identifier": "property"
	42	},
	43	"bindings": {
	44	"value" : {"<-": "@owner.propertyText" }
	45	},
	46	"listeners": [
	47	{
	48	"type": "change",
	49	"listener": {"@": "owner"}
	50	},
	51	{
	52	"type": "stop",
	53	"listener": {"@": "owner"}
	54	}
	55	]
	56	},
	57	"value": {
	58	"prototype": "js/components/hintable.reel",
	59	"properties": {
	60	"startOnEvent": "click",
	61	"element": {"#": "value"},
	62	"identifier": "value"
	63	},
	64	"bindings": {
	65	"value" : {"<-": "@owner.valueText" }
	66	},
	67	"listeners": [
	68	{
	69	"type": "change",
	70	"listener": {"@": "owner"}
	71	},
	72	{
	73	"type": "stop",
	74	"listener": {"@": "owner"}
	75	}
	76	]
	77	}
	78	}
	79	</script>
	80	</head>
	81	<body>
	82	<div data-montage-id="container" class="style-item" spellcheck="false" draggable="false">
	83	<input type="checkbox" data-montage-id="disable-checkbox"><dt data-montage-id="property" class="css-property"></dt><dd data-montage-id="value" class="css-value"></dd>
	84	<button data-montage-id="add-style-button" class="add-style-button">Add</button>
	85	</div>
	86	</body>
	87	</html> \ No newline at end of file