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/rule-components/css-style-rule.reel/css-style-rule.html
parent: 9253e2ce98d748edd8c3929f113a597923960387 (diff)
parent: d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff)
download: ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz
1 files changed, 90 insertions, 0 deletions
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
new file mode 100644
index 00000000..f203b61f
--- /dev/null
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
@@ -0,0 +1,90 @@
+<!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-rule.css" rel="stylesheet" type="text/css">
+    <script type="text/montage-serialization">
+        {
+            "owner": {
+                "prototype" : "js/panels/css-panel/rule-components/css-style-rule.reel",
+                "properties" : {
+                    "element" : {"#" : "rule-item"},
+                    "selectorField": {"@": "selector"},
+                    "declarationComponent": {"@": "declaration"}
+                }
+            },
+            "sheetName": {
+                "prototype": "montage/ui/dynamic-text.reel",
+                "properties": {
+                    "element": {"#": "style-sheet-name"}
+                },
+                "bindings": {
+                    "value" : {"<-": "@owner.sheetName" }
+                }
+            },
+            "selector": {
+                "prototype": "js/components/hintable.reel",
+                "properties": {
+                    "startOnEvent": "click",
+                    "element": {"#": "rule-selector"}
+                },
+                "bindings": {
+                    "value" : {"<<->":"@owner.selector" }
+                }
+            },
+            "declaration": {
+                "prototype": "js/panels/css-panel/style-declaration.reel",
+                "properties": {
+                    "element": {"#": "declaration-list"}
+                },
+                "bindings": {
+                    "focusDelegate" : {"<-": "@owner.focusDelegate" },
+                    "declaration" : {"<-": "@owner._declaration" }
+                }
+            },
+            "sheetLink": {
+                "prototype": "montage/ui/anchor.reel",
+                "properties": {
+                    "element": {"#": "style-sheet-name"}
+                }
+            }
+        }
+    </script>
+    <script type="text/json">
+        "declaration": {
+        "module": "js/panels/css-panel/declaration.reel",
+        "name": "Declaration",
+        "properties": {
+        "element": {"#": "declaration-list"}
+        },
+        "bindings": {
+        "focusDelegate" : {
+        "boundObject": {"@": "owner"},
+        "boundObjectPropertyPath": "focusDelegate",
+        "oneway": true
+        },
+        "declaration" : {
+        "boundObject": {"@": "owner"},
+        "boundObjectPropertyPath": "_declaration",
+        "oneway": true
+        }
+        }
+        },
+    </script>
+</head>
+<body>
+<li data-montage-id="rule-item" class="css-style-rule-item">
+    <div class="style-rule-heading">
+        <a href="#" id="style-sheet-name" class="style-sheet-name"></a>
+        <span id="rule-selector" class="nj-css-selector"></span>
+    </div>
+    <dl id="declaration-list"></dl>
+</li>
+</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/rule-components/css-style-rule.reel/css-style-rule.html
parent	9253e2ce98d748edd8c3929f113a597923960387 (diff)
parent	d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff)
download	ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz

diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html new file mode 100644 index 00000000..f203b61f --- /dev/null +++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
@@ -0,0 +1,90 @@
	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-rule.css" rel="stylesheet" type="text/css">
	11	<script type="text/montage-serialization">
	12	{
	13	"owner": {
	14	"prototype" : "js/panels/css-panel/rule-components/css-style-rule.reel",
	15	"properties" : {
	16	"element" : {"#" : "rule-item"},
	17	"selectorField": {"@": "selector"},
	18	"declarationComponent": {"@": "declaration"}
	19	}
	20	},
	21	"sheetName": {
	22	"prototype": "montage/ui/dynamic-text.reel",
	23	"properties": {
	24	"element": {"#": "style-sheet-name"}
	25	},
	26	"bindings": {
	27	"value" : {"<-": "@owner.sheetName" }
	28	}
	29	},
	30	"selector": {
	31	"prototype": "js/components/hintable.reel",
	32	"properties": {
	33	"startOnEvent": "click",
	34	"element": {"#": "rule-selector"}
	35	},
	36	"bindings": {
	37	"value" : {"<<->":"@owner.selector" }
	38	}
	39	},
	40	"declaration": {
	41	"prototype": "js/panels/css-panel/style-declaration.reel",
	42	"properties": {
	43	"element": {"#": "declaration-list"}
	44	},
	45	"bindings": {
	46	"focusDelegate" : {"<-": "@owner.focusDelegate" },
	47	"declaration" : {"<-": "@owner._declaration" }
	48
	49	}
	50	},
	51	"sheetLink": {
	52	"prototype": "montage/ui/anchor.reel",
	53	"properties": {
	54	"element": {"#": "style-sheet-name"}
	55	}
	56	}
	57	}
	58	</script>
	59	<script type="text/json">
	60	"declaration": {
	61	"module": "js/panels/css-panel/declaration.reel",
	62	"name": "Declaration",
	63	"properties": {
	64	"element": {"#": "declaration-list"}
	65	},
	66	"bindings": {
	67	"focusDelegate" : {
	68	"boundObject": {"@": "owner"},
	69	"boundObjectPropertyPath": "focusDelegate",
	70	"oneway": true
	71	},
	72	"declaration" : {
	73	"boundObject": {"@": "owner"},
	74	"boundObjectPropertyPath": "_declaration",
	75	"oneway": true
	76	}
	77	}
	78	},
	79	</script>
	80	</head>
	81	<body>
	82	<li data-montage-id="rule-item" class="css-style-rule-item">
	83	<div class="style-rule-heading">
	84	<a href="#" id="style-sheet-name" class="style-sheet-name"></a>
	85	<span id="rule-selector" class="nj-css-selector"></span>
	86	</div>
	87	<dl id="declaration-list"></dl>
	88	</li>
	89	</body>
	90	</html> \ No newline at end of file