Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2123225 by Jelle_S, attiks, Risse, bradklaver | Wim Leers: Fixed Do not upscale by default.

8.0.x
Alex Pott 2014-09-11 12:16:18 +01:00
parent 949cb6313b
commit 535c590988
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/image/config/install/image.style.large.yml
View File

@ -6,7 +6,7 @@ effects:
data: data:
width: 480 width: 480
height: 480 height: 480
upscale: true upscale: false
weight: 0 weight: 0
uuid: ddd73aa7-4bd6-4c85-b600-bdf2b1628d1d uuid: ddd73aa7-4bd6-4c85-b600-bdf2b1628d1d
langcode: en langcode: en

2
core/modules/image/config/install/image.style.medium.yml
View File

@ -6,7 +6,7 @@ effects:
data: data:
width: 220 width: 220
height: 220 height: 220
upscale: true upscale: false
weight: 0 weight: 0
uuid: bddf0d06-42f9-4c75-a700-a33cafa25ea0 uuid: bddf0d06-42f9-4c75-a700-a33cafa25ea0
langcode: en langcode: en

2
core/modules/image/config/install/image.style.thumbnail.yml
View File

@ -6,7 +6,7 @@ effects:
data: data:
width: 100 width: 100
height: 100 height: 100
upscale: true upscale: false
weight: 0 weight: 0
uuid: 1cfec298-8620-4749-b100-ccb6c4500779 uuid: 1cfec298-8620-4749-b100-ccb6c4500779
langcode: en langcode: en

8
core/modules/image/src/Tests/ImageFieldDisplayTest.php
View File

@ -143,8 +143,8 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
$image_style = array( $image_style = array(
'#theme' => 'image_style', '#theme' => 'image_style',
'#uri' => $image_uri, '#uri' => $image_uri,
'#width' => 100, '#width' => 40,
'#height' => 50, '#height' => 20,
'#style_name' => 'thumbnail', '#style_name' => 'thumbnail',
); );
$default_output = drupal_render($image_style); $default_output = drupal_render($image_style);
@ -199,8 +199,8 @@ class ImageFieldDisplayTest extends ImageFieldTestBase {
$image_style = array( $image_style = array(
'#theme' => 'image_style', '#theme' => 'image_style',
'#uri' => file_load($node->{$field_name}->target_id)->getFileUri(), '#uri' => file_load($node->{$field_name}->target_id)->getFileUri(),
'#width' => 220, '#width' => 40,
'#height' => 110, '#height' => 20,
'#style_name' => 'medium', '#style_name' => 'medium',
); );
$default_output = drupal_render($image_style); $default_output = drupal_render($image_style);

2
core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
View File

@ -165,7 +165,7 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
$fallback_image = array( $fallback_image = array(
'#theme' => 'responsive_image_source', '#theme' => 'responsive_image_source',
'#src' => $large_style->buildUrl($image_uri), '#src' => $large_style->buildUrl($image_uri),
'#dimensions' => array('width' => 480, 'height' => 240), '#dimensions' => array('width' => 40, 'height' => 20),
); );
$default_output = drupal_render($fallback_image); $default_output = drupal_render($fallback_image);
$this->assertRaw($default_output, 'Image style thumbnail formatter displaying correctly on full node view.'); $this->assertRaw($default_output, 'Image style thumbnail formatter displaying correctly on full node view.');