diff options
author | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-31 08:54:48 -0700 |
commit | f297093b5bfa62c9832829751a12f0e556bb5cc0 (patch) | |
tree | 6e04cdf142cb1b36e2197970c9dc2141017a2be7 /js/panels/CSSPanel/css-shorthand-map.js | |
parent | 9253e2ce98d748edd8c3929f113a597923960387 (diff) | |
parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
download | ninja-f297093b5bfa62c9832829751a12f0e556bb5cc0.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/properties.reel/properties.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/CSSPanel/css-shorthand-map.js')
-rwxr-xr-x | js/panels/CSSPanel/css-shorthand-map.js | 45 |
1 files changed, 32 insertions, 13 deletions
diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js index bc43ebc4..d469e2a1 100755 --- a/js/panels/CSSPanel/css-shorthand-map.js +++ b/js/panels/CSSPanel/css-shorthand-map.js | |||
@@ -16,24 +16,24 @@ exports.CSS_SHORTHAND_MAP = { | |||
16 | 'background-repeat-y' : ['background', 'background-repeat'], | 16 | 'background-repeat-y' : ['background', 'background-repeat'], |
17 | 17 | ||
18 | 'border-bottom' : ['border'], | 18 | 'border-bottom' : ['border'], |
19 | 'border-bottom-color' : ['border', 'border-bottom'], | 19 | 'border-bottom-color' : ['border-bottom'], |
20 | 'border-bottom-style' : ['border', 'border-bottom'], | 20 | 'border-bottom-style' : ['border-bottom'], |
21 | 'border-bottom-width' : ['border', 'border-bottom'], | 21 | 'border-bottom-width' : ['border-bottom'], |
22 | 22 | ||
23 | 'border-left' : ['border'], | 23 | 'border-left' : ['border'], |
24 | 'border-left-color' : ['border', 'border-left'], | 24 | 'border-left-color' : ['border-left'], |
25 | 'border-left-style' : ['border', 'border-left'], | 25 | 'border-left-style' : ['border-left'], |
26 | 'border-left-width' : ['border', 'border-left'], | 26 | 'border-left-width' : ['border-left'], |
27 | 27 | ||
28 | 'border-right' : ['border'], | 28 | 'border-right' : ['border'], |
29 | 'border-right-color' : ['border', 'border-right'], | 29 | 'border-right-color' : ['border-right'], |
30 | 'border-right-style' : ['border', 'border-right'], | 30 | 'border-right-style' : ['border-right'], |
31 | 'border-right-width' : ['border', 'border-right'], | 31 | 'border-right-width' : ['border-right'], |
32 | 32 | ||
33 | 'border-top' : ['border'], | 33 | 'border-top' : ['border'], |
34 | 'border-top-color' : ['border', 'border-top'], | 34 | 'border-top-color' : ['border-top'], |
35 | 'border-top-style' : ['border', 'border-top'], | 35 | 'border-top-style' : ['border-top'], |
36 | 'border-top-width' : ['border', 'border-top'], | 36 | 'border-top-width' : ['border-top'], |
37 | 37 | ||
38 | 'border-color' : ['border'], | 38 | 'border-color' : ['border'], |
39 | 'border-style' : ['border'], | 39 | 'border-style' : ['border'], |
@@ -52,7 +52,6 @@ exports.CSS_SHORTHAND_MAP = { | |||
52 | 'font-style' : ['font'], | 52 | 'font-style' : ['font'], |
53 | 'font-family' : ['font'], | 53 | 'font-family' : ['font'], |
54 | 'font-size' : ['font'], | 54 | 'font-size' : ['font'], |
55 | 'font-style' : ['font'], | ||
56 | 'font-variant' : ['font'], | 55 | 'font-variant' : ['font'], |
57 | 'font-weight' : ['font'], | 56 | 'font-weight' : ['font'], |
58 | 57 | ||
@@ -74,4 +73,24 @@ exports.CSS_SHORTHAND_MAP = { | |||
74 | '-webkit-transition-duration' : ['-webkit-transition'], | 73 | '-webkit-transition-duration' : ['-webkit-transition'], |
75 | '-webkit-transition-timing-function' : ['-webkit-transition'], | 74 | '-webkit-transition-timing-function' : ['-webkit-transition'], |
76 | '-webkit-transition-delay' : ['-webkit-transition'] | 75 | '-webkit-transition-delay' : ['-webkit-transition'] |
76 | }; | ||
77 | |||
78 | exports.CSS_SHORTHAND_TO_SUBPROP_MAP = { | ||
79 | 'background' : ["background-image", "background-repeat-x", "background-repeat-y", "background-attachment", | ||
80 | "background-position-x", "background-position-y", "background-origin", "background-clip", | ||
81 | "background-color"], | ||
82 | 'border' : ['border-width', 'border-style', 'border-color'], | ||
83 | 'border-top' : ['border-top-width', 'border-top-style', 'border-top-color'], | ||
84 | 'border-right' : ['border-right-width', 'border-right-style', 'border-right-color'], | ||
85 | 'border-bottom' : ['border-bottom-width', 'border-bottom-style', 'border-bottom-color'], | ||
86 | 'border-left' : ['border-left-width', 'border-left-style', 'border-left-color'], | ||
87 | 'border-image' : ['border-image-outset', 'border-image-repeat','border-image-slice', 'border-image-source', 'border-image-width'], | ||
88 | 'border-radius' : ["border-top-left-radius", "border-top-right-radius", "border-bottom-right-radius", | ||
89 | "border-bottom-left-radius"], | ||
90 | 'font' : ["font-family", "font-size", "font-style", "font-variant", "font-weight", "line-height"], | ||
91 | 'list' : ["list-style-type", "list-style-image", "list-style-position"], | ||
92 | 'margin' : ["margin-top", "margin-right", "margin-bottom", "margin-left"], | ||
93 | 'padding' : ["padding-top", "padding-right", "padding-bottom", "padding-left"], | ||
94 | '-webkit-transition' : ["-webkit-transition-property", "-webkit-transition-duration", | ||
95 | "-webkit-transition-timing-function", "-webkit-transition-delay"] | ||
77 | }; \ No newline at end of file | 96 | }; \ No newline at end of file |