| @@ -89,47 +89,51 @@ | ||
| 89 | 89 | $css['mask-repeat'] = 'no-repeat'; |
| 90 | 90 | $css['-webkit-mask-repeat'] = 'no-repeat'; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | + // Device-specific overrides. Read through device_member(): a custom | |
| 94 | + // breakpoint (or the generator's value-less probe suffix) has no key of | |
| 95 | + // its own in the control's defaults, and indexing it directly is what | |
| 96 | + // produced "Undefined array key …" notices on every page. | |
| 97 | + $mask_size = self::device_member( $value, 'maskSize', $device ); | |
| 98 | + $mask_position = self::device_member( $value, 'maskPosition', $device ); | |
| 99 | + $mask_repeat = self::device_member( $value, 'maskRepeat', $device ); | |
| 100 | + | |
| 93 | 101 | // Device-specific size: named value (contain / cover) |
| 94 | - if ( $value[ 'maskSize' . $device ] && 'custom' !== $value[ 'maskSize' . $device ] ) { | |
| 95 | - $css['mask-size'] = $value[ 'maskSize' . $device ]; | |
| 102 | + if ( $mask_size && 'custom' !== $mask_size ) { | |
| 103 | + $css['mask-size'] = $mask_size; | |
| 96 | 104 | $css['-webkit-mask-size'] = $css['mask-size']; |
| 97 | 105 | } |
| 98 | 106 | |
| 99 | 107 | // Device-specific size: custom px/em/% value |
| 100 | - if ( | |
| 101 | - $value[ 'maskSize' . $device ] && | |
| 102 | - 'custom' === $value[ 'maskSize' . $device ] && | |
| 103 | - $value[ 'scaleUnit' . $device ] | |
| 104 | - ) { | |
| 105 | - $css['mask-size'] = $value[ 'scale' . $device ] . $value[ 'scaleUnit' . $device ]; | |
| 108 | + $scale_unit = self::device_member( $value, 'scaleUnit', $device ); | |
| 109 | + if ( $mask_size && 'custom' === $mask_size && $scale_unit ) { | |
| 110 | + $css['mask-size'] = self::device_member( $value, 'scale', $device ) . $scale_unit; | |
| 106 | 111 | $css['-webkit-mask-size'] = $css['mask-size']; |
| 107 | 112 | } |
| 108 | 113 | |
| 109 | 114 | // Device-specific position: named value (e.g. top left, center center) |
| 110 | - if ( | |
| 111 | - $value[ 'maskPosition' . $device ] && | |
| 112 | - 'custom' !== $value[ 'maskPosition' . $device ] | |
| 113 | - ) { | |
| 114 | - $css['mask-position'] = $value[ 'maskPosition' . $device ]; | |
| 115 | + if ( $mask_position && 'custom' !== $mask_position ) { | |
| 116 | + $css['mask-position'] = $mask_position; | |
| 115 | 117 | $css['-webkit-mask-position'] = $css['mask-position']; |
| 116 | 118 | } |
| 117 | 119 | |
| 118 | 120 | // Device-specific position: custom X Y values |
| 119 | 121 | // Use !== '' rather than truthy so a value of '0' is not skipped. |
| 120 | - if ( 'custom' === $value[ 'maskPosition' . $device ] ) { | |
| 121 | - $x_val = $value[ 'xPosition' . $device ] !== '' ? $value[ 'xPosition' . $device ] : '0'; | |
| 122 | - $y_val = $value[ 'yPosition' . $device ] !== '' ? $value[ 'yPosition' . $device ] : '0'; | |
| 123 | - $x_unit = $value[ 'xPositionUnit' . $device ]; | |
| 124 | - $y_unit = $value[ 'yPositionUnit' . $device ]; | |
| 122 | + if ( 'custom' === $mask_position ) { | |
| 123 | + $x_pos = self::device_member( $value, 'xPosition', $device ); | |
| 124 | + $y_pos = self::device_member( $value, 'yPosition', $device ); | |
| 125 | + $x_val = '' !== $x_pos ? $x_pos : '0'; | |
| 126 | + $y_val = '' !== $y_pos ? $y_pos : '0'; | |
| 127 | + $x_unit = self::device_member( $value, 'xPositionUnit', $device ); | |
| 128 | + $y_unit = self::device_member( $value, 'yPositionUnit', $device ); | |
| 125 | 129 | $css['mask-position'] = $x_val . $x_unit . ' ' . $y_val . $y_unit; |
| 126 | 130 | $css['-webkit-mask-position'] = $css['mask-position']; |
| 127 | 131 | } |
| 128 | 132 | |
| 129 | 133 | // Device-specific repeat override |
| 130 | - if ( $value[ 'maskRepeat' . $device ] ) { | |
| 131 | - $css['mask-repeat'] = $value[ 'maskRepeat' . $device ]; | |
| 134 | + if ( $mask_repeat ) { | |
| 135 | + $css['mask-repeat'] = $mask_repeat; | |
| 132 | 136 | $css['-webkit-mask-repeat'] = $css['mask-repeat']; |
| 133 | 137 | } |
| 134 | 138 | |
| 135 | 139 | return $css; |
