diff options
author | Eric Guzman | 2012-05-08 13:26:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-08 13:26:36 -0700 |
commit | eb80f8a610100f908b5cb9ffc65bfa94f8a23c21 (patch) | |
tree | 5f9d1f17e532d68019eafc69e82b9228216aac95 /js/panels/css-panel/rule-components | |
parent | af4dac82d2e76fe90191d6c085740d855bf961f3 (diff) | |
download | ninja-eb80f8a610100f908b5cb9ffc65bfa94f8a23c21.tar.gz |
CSS Panel - Create non-tree declaration (optimized). And add updating functionality.
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.html | 25 | ||||
-rw-r--r-- | js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.js | 2 |
2 files changed, 24 insertions, 3 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 bf101719..05ea669f 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 | |||
@@ -49,8 +49,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
49 | } | 49 | } |
50 | }, | 50 | }, |
51 | "declaration": { | 51 | "declaration": { |
52 | "module": "js/panels/css-panel/declaration.reel", | 52 | "module": "js/panels/css-panel/style-declaration.reel", |
53 | "name": "Declaration", | 53 | "name": "StyleDeclaration", |
54 | "properties": { | 54 | "properties": { |
55 | "element": {"#": "declaration-list"} | 55 | "element": {"#": "declaration-list"} |
56 | }, | 56 | }, |
@@ -76,6 +76,27 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
76 | } | 76 | } |
77 | } | 77 | } |
78 | </script> | 78 | </script> |
79 | <script type="text/json"> | ||
80 | "declaration": { | ||
81 | "module": "js/panels/css-panel/declaration.reel", | ||
82 | "name": "Declaration", | ||
83 | "properties": { | ||
84 | "element": {"#": "declaration-list"} | ||
85 | }, | ||
86 | "bindings": { | ||
87 | "focusDelegate" : { | ||
88 | "boundObject": {"@": "owner"}, | ||
89 | "boundObjectPropertyPath": "focusDelegate", | ||
90 | "oneway": true | ||
91 | }, | ||
92 | "declaration" : { | ||
93 | "boundObject": {"@": "owner"}, | ||
94 | "boundObjectPropertyPath": "_declaration", | ||
95 | "oneway": true | ||
96 | } | ||
97 | } | ||
98 | }, | ||
99 | </script> | ||
79 | </head> | 100 | </head> |
80 | <body> | 101 | <body> |
81 | <li data-montage-id="rule-item" class="css-style-rule-item"> | 102 | <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 7a6a3957..c74502c0 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 | |||
@@ -103,7 +103,7 @@ exports.CssStyleRule = Montage.create(Component, { | |||
103 | value: function() { | 103 | value: function() { |
104 | if(this.cssText !== this.rule.cssText) { | 104 | if(this.cssText !== this.rule.cssText) { |
105 | // TODO: add update for selector and stylesheet name | 105 | // TODO: add update for selector and stylesheet name |
106 | //this.declarationComponent.update(); | 106 | this.declarationComponent.update(); |
107 | } | 107 | } |
108 | } | 108 | } |
109 | }, | 109 | }, |