diff options
Diffstat (limited to 'js/panels/CSSPanel/css-shorthand-map.js')
-rwxr-xr-x | js/panels/CSSPanel/css-shorthand-map.js | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/js/panels/CSSPanel/css-shorthand-map.js b/js/panels/CSSPanel/css-shorthand-map.js index dc0b4a55..872bc55c 100755 --- a/js/panels/CSSPanel/css-shorthand-map.js +++ b/js/panels/CSSPanel/css-shorthand-map.js | |||
@@ -1,24 +1,25 @@ | |||
1 | /* <copyright> | 1 | /* <copyright> |
2 | Copyright (c) 2012, Motorola Mobility, Inc | 2 | Copyright (c) 2012, Motorola Mobility LLC. |
3 | All Rights Reserved. | 3 | All Rights Reserved. |
4 | BSD License. | ||
5 | 4 | ||
6 | Redistribution and use in source and binary forms, with or without | 5 | Redistribution and use in source and binary forms, with or without |
7 | modification, are permitted provided that the following conditions are met: | 6 | modification, are permitted provided that the following conditions are met: |
8 | 7 | ||
9 | - Redistributions of source code must retain the above copyright notice, | 8 | * Redistributions of source code must retain the above copyright notice, |
10 | this list of conditions and the following disclaimer. | 9 | this list of conditions and the following disclaimer. |
11 | - Redistributions in binary form must reproduce the above copyright | 10 | |
12 | notice, this list of conditions and the following disclaimer in the | 11 | * Redistributions in binary form must reproduce the above copyright notice, |
13 | documentation and/or other materials provided with the distribution. | 12 | this list of conditions and the following disclaimer in the documentation |
14 | - Neither the name of Motorola Mobility nor the names of its contributors | 13 | and/or other materials provided with the distribution. |
15 | may be used to endorse or promote products derived from this software | 14 | |
16 | without specific prior written permission. | 15 | * Neither the name of Motorola Mobility LLC nor the names of its |
16 | contributors may be used to endorse or promote products derived from this | ||
17 | software without specific prior written permission. | ||
17 | 18 | ||
18 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 19 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
19 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 20 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
20 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 21 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
21 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | 22 | ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
22 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | 23 | LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
23 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | 24 | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
24 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | 25 | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
@@ -38,56 +39,56 @@ exports.CSS_SHORTHAND_MAP = { | |||
38 | 'background-position-y' : ['background', 'background-position'], | 39 | 'background-position-y' : ['background', 'background-position'], |
39 | 'background-repeat-x' : ['background', 'background-repeat'], | 40 | 'background-repeat-x' : ['background', 'background-repeat'], |
40 | 'background-repeat-y' : ['background', 'background-repeat'], | 41 | 'background-repeat-y' : ['background', 'background-repeat'], |
41 | 42 | ||
42 | 'border-bottom' : ['border'], | 43 | 'border-bottom' : ['border'], |
43 | 'border-bottom-color' : ['border-bottom'], | 44 | 'border-bottom-color' : ['border-bottom'], |
44 | 'border-bottom-style' : ['border-bottom'], | 45 | 'border-bottom-style' : ['border-bottom'], |
45 | 'border-bottom-width' : ['border-bottom'], | 46 | 'border-bottom-width' : ['border-bottom'], |
46 | 47 | ||
47 | 'border-left' : ['border'], | 48 | 'border-left' : ['border'], |
48 | 'border-left-color' : ['border-left'], | 49 | 'border-left-color' : ['border-left'], |
49 | 'border-left-style' : ['border-left'], | 50 | 'border-left-style' : ['border-left'], |
50 | 'border-left-width' : ['border-left'], | 51 | 'border-left-width' : ['border-left'], |
51 | 52 | ||
52 | 'border-right' : ['border'], | 53 | 'border-right' : ['border'], |
53 | 'border-right-color' : ['border-right'], | 54 | 'border-right-color' : ['border-right'], |
54 | 'border-right-style' : ['border-right'], | 55 | 'border-right-style' : ['border-right'], |
55 | 'border-right-width' : ['border-right'], | 56 | 'border-right-width' : ['border-right'], |
56 | 57 | ||
57 | 'border-top' : ['border'], | 58 | 'border-top' : ['border'], |
58 | 'border-top-color' : ['border-top'], | 59 | 'border-top-color' : ['border-top'], |
59 | 'border-top-style' : ['border-top'], | 60 | 'border-top-style' : ['border-top'], |
60 | 'border-top-width' : ['border-top'], | 61 | 'border-top-width' : ['border-top'], |
61 | 62 | ||
62 | 'border-color' : ['border'], | 63 | 'border-color' : ['border'], |
63 | 'border-style' : ['border'], | 64 | 'border-style' : ['border'], |
64 | 65 | ||
65 | 'border-image-outset' : ['border-image'], | 66 | 'border-image-outset' : ['border-image'], |
66 | 'border-image-repeat' : ['border-image'], | 67 | 'border-image-repeat' : ['border-image'], |
67 | 'border-image-slice' : ['border-image'], | 68 | 'border-image-slice' : ['border-image'], |
68 | 'border-image-source' : ['border-image'], | 69 | 'border-image-source' : ['border-image'], |
69 | 'border-image-width' : ['border-image'], | 70 | 'border-image-width' : ['border-image'], |
70 | 71 | ||
71 | 'border-bottom-left-radius' : ['border-radius'], | 72 | 'border-bottom-left-radius' : ['border-radius'], |
72 | 'border-bottom-right-radius' : ['border-radius'], | 73 | 'border-bottom-right-radius' : ['border-radius'], |
73 | 'border-top-left-radius' : ['border-radius'], | 74 | 'border-top-left-radius' : ['border-radius'], |
74 | 'border-top-right-radius' : ['border-radius'], | 75 | 'border-top-right-radius' : ['border-radius'], |
75 | 76 | ||
76 | 'font-style' : ['font'], | 77 | 'font-style' : ['font'], |
77 | 'font-family' : ['font'], | 78 | 'font-family' : ['font'], |
78 | 'font-size' : ['font'], | 79 | 'font-size' : ['font'], |
79 | 'font-variant' : ['font'], | 80 | 'font-variant' : ['font'], |
80 | 'font-weight' : ['font'], | 81 | 'font-weight' : ['font'], |
81 | 82 | ||
82 | 'list-style-image' : ['list-style'], | 83 | 'list-style-image' : ['list-style'], |
83 | 'list-style-position' : ['list-style'], | 84 | 'list-style-position' : ['list-style'], |
84 | 'list-style-type' : ['list-style'], | 85 | 'list-style-type' : ['list-style'], |
85 | 86 | ||
86 | 'margin-bottom' : ['margin'], | 87 | 'margin-bottom' : ['margin'], |
87 | 'margin-left' : ['margin'], | 88 | 'margin-left' : ['margin'], |
88 | 'margin-right' : ['margin'], | 89 | 'margin-right' : ['margin'], |
89 | 'margin-top' : ['margin'], | 90 | 'margin-top' : ['margin'], |
90 | 91 | ||
91 | 'padding-bottom' : ['padding'], | 92 | 'padding-bottom' : ['padding'], |
92 | 'padding-left' : ['padding'], | 93 | 'padding-left' : ['padding'], |
93 | 'padding-right' : ['padding'], | 94 | 'padding-right' : ['padding'], |