aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/rule-components
diff options
context:
space:
mode:
authorPushkar Joshi2012-06-13 14:00:31 -0700
committerPushkar Joshi2012-06-13 14:00:31 -0700
commit596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch)
tree480f42ffc0782ca768284c1208a8f99adb5636a2 /js/panels/css-panel/rule-components
parent75df16b937bb420e7d93a411e73f7b59578b1b7e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/css-panel/rule-components')
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html23
-rw-r--r--js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js5
2 files changed, 6 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">
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
index 54181bf3..5361e5cc 100644
--- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
+++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js
@@ -8,6 +8,11 @@ var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component; 8 Component = require("montage/ui/component").Component;
9 9
10exports.CssStyleRule = Montage.create(Component, { 10exports.CssStyleRule = Montage.create(Component, {
11
12 selectorField: {
13 value: null
14 },
15
11 addClassNameOnChange : { 16 addClassNameOnChange : {
12 value: null 17 value: null
13 }, 18 },