diff options
| author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
| commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
| tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html | |
| parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
| parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
| download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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.html | 23 |
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"> |