diff options
| author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
| commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
| tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/panels/css-panel/style-declaration.reel | |
| parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
| parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
| download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/css-panel/style-declaration.reel')
| -rw-r--r-- | js/panels/css-panel/style-declaration.reel/style-declaration.html | 6 | ||||
| -rw-r--r-- | js/panels/css-panel/style-declaration.reel/style-declaration.js | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/js/panels/css-panel/style-declaration.reel/style-declaration.html b/js/panels/css-panel/style-declaration.reel/style-declaration.html index fad54453..4cdf0741 100644 --- a/js/panels/css-panel/style-declaration.reel/style-declaration.html +++ b/js/panels/css-panel/style-declaration.reel/style-declaration.html | |||
| @@ -43,9 +43,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 43 | }, | 43 | }, |
| 44 | "bindings": { | 44 | "bindings": { |
| 45 | "source": {"<-": "@repetition.objectAtCurrentIteration" }, | 45 | "source": {"<-": "@repetition.objectAtCurrentIteration" }, |
| 46 | "propertyText": {"<<->": "@repetition.objectAtCurrentIteration.name" }, | 46 | "propertyText": {"<->": "@repetition.objectAtCurrentIteration.name" }, |
| 47 | "valueText": {"<<->": "@repetition.objectAtCurrentIteration.value" }, | 47 | "valueText": {"<->": "@repetition.objectAtCurrentIteration.value" }, |
| 48 | "empty": {"<<->": "@repetition.objectAtCurrentIteration.isEmpty" }, | 48 | "empty": {"<->": "@repetition.objectAtCurrentIteration.isEmpty" }, |
| 49 | "delegate": {"<-": "@owner.focusDelegate" } | 49 | "delegate": {"<-": "@owner.focusDelegate" } |
| 50 | } | 50 | } |
| 51 | } | 51 | } |
diff --git a/js/panels/css-panel/style-declaration.reel/style-declaration.js b/js/panels/css-panel/style-declaration.reel/style-declaration.js index 6187989b..b9205ba7 100644 --- a/js/panels/css-panel/style-declaration.reel/style-declaration.js +++ b/js/panels/css-panel/style-declaration.reel/style-declaration.js | |||
| @@ -9,6 +9,18 @@ var Montage = require("montage/core/core").Montage, | |||
| 9 | ShorthandProps = require("js/panels/CSSPanel/css-shorthand-map"); | 9 | ShorthandProps = require("js/panels/CSSPanel/css-shorthand-map"); |
| 10 | 10 | ||
| 11 | exports.StyleDeclaration = Montage.create(Component, { | 11 | exports.StyleDeclaration = Montage.create(Component, { |
| 12 | arrayController: { | ||
| 13 | value: null | ||
| 14 | }, | ||
| 15 | |||
| 16 | styleComponent: { | ||
| 17 | value: null | ||
| 18 | }, | ||
| 19 | |||
| 20 | repetition: { | ||
| 21 | value: null | ||
| 22 | }, | ||
| 23 | |||
| 12 | cssText : { value: null }, | 24 | cssText : { value: null }, |
| 13 | focusDelegate : { value: null }, | 25 | focusDelegate : { value: null }, |
| 14 | needsSort : { value: null }, | 26 | needsSort : { value: null }, |