diff options
| author | Eric Guzman | 2012-05-22 09:27:25 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-22 09:27:25 -0700 |
| commit | 1f4d7643b484cab4258cda2bb8eefcc6a60452df (patch) | |
| tree | 04e1616df883bf1ad999d07fa49f355fc71413a2 /js/panels/CSSPanel | |
| parent | 6686f2f0bc3ea1b4f589409c78a99bd07a41e7c3 (diff) | |
| download | ninja-1f4d7643b484cab4258cda2bb8eefcc6a60452df.tar.gz | |
CSS Style Declaration - Improve shorthand filtering
Diffstat (limited to 'js/panels/CSSPanel')
| -rwxr-xr-x | js/panels/CSSPanel/css-shorthand-map.js | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js index 191dbae5..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'], |
| @@ -79,9 +79,12 @@ exports.CSS_SHORTHAND_TO_SUBPROP_MAP = { | |||
| 79 | 'background' : ["background-image", "background-repeat-x", "background-repeat-y", "background-attachment", | 79 | 'background' : ["background-image", "background-repeat-x", "background-repeat-y", "background-attachment", |
| 80 | "background-position-x", "background-position-y", "background-origin", "background-clip", | 80 | "background-position-x", "background-position-y", "background-origin", "background-clip", |
| 81 | "background-color"], | 81 | "background-color"], |
| 82 | 'border' : ["border-top-width", "border-right-width", "border-bottom-width", "border-left-width", | 82 | 'border' : ['border-width', 'border-style', 'border-color'], |
| 83 | "border-top-style", "border-right-style", "border-bottom-style", "border-left-style", | 83 | 'border-top' : ['border-top-width', 'border-top-style', 'border-top-color'], |
| 84 | "border-top-color", "border-right-color", "border-bottom-color", "border-left-color", "border-image"], | 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'], | ||
| 85 | 'border-radius' : ["border-top-left-radius", "border-top-right-radius", "border-bottom-right-radius", | 88 | 'border-radius' : ["border-top-left-radius", "border-top-right-radius", "border-bottom-right-radius", |
| 86 | "border-bottom-left-radius"], | 89 | "border-bottom-left-radius"], |
| 87 | 'font' : ["font-family", "font-size", "font-style", "font-variant", "font-weight", "line-height"], | 90 | 'font' : ["font-family", "font-size", "font-style", "font-variant", "font-weight", "line-height"], |