aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
diff options
context:
space:
mode:
authorEric Guzman2012-06-19 01:20:36 -0700
committerEric Guzman2012-06-19 01:20:36 -0700
commit2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch)
treef69f4e3de7e4441311ef2b38770e0ce26067aac4 /js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html
parent5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff)
parent1007cbf983ad0f2460a4122a492a96023fdb4439 (diff)
downloadninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts: js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html')
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html23
1 files changed, 1 insertions, 22 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
index f203b61f..8b0c3101 100644
--- 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
@@ -34,7 +34,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
34 "element": {"#": "rule-selector"} 34 "element": {"#": "rule-selector"}
35 }, 35 },
36 "bindings": { 36 "bindings": {
37 "value" : {"<<->":"@owner.selector" } 37 "value" : {"<->":"@owner.selector" }
38 } 38 }
39 }, 39 },
40 "declaration": { 40 "declaration": {
@@ -56,27 +56,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
56 } 56 }
57 } 57 }
58 </script> 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> 59</head>
81<body> 60<body>
82<li data-montage-id="rule-item" class="css-style-rule-item"> 61<li data-montage-id="rule-item" class="css-style-rule-item">