summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2015-02-11 16:12:46 (GMT)
committerAlex Pott2015-02-11 16:12:46 (GMT)
commitdbb32f2e18d3b1b79bbe50335ca93da8ea9ed382 (patch)
tree39f0fb1c44b4fbe4e625ac710085738ff3b6296a
parent45268c11b3a4ed88a7f08fd7e4405c59d3003a7a (diff)
Issue #2260061 by Jelle_S, attiks, Wim Leers, mdrummond, mgifford, holist: Responsive image module does not support sizes/picture polyfill 2.2
-rw-r--r--core/assets/vendor/picturefill/picturefill.js126
-rw-r--r--core/assets/vendor/picturefill/picturefill.min.js4
-rw-r--r--core/core.libraries.yml8
-rw-r--r--core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php98
-rw-r--r--core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.breakpoints.yml6
-rw-r--r--core/modules/breakpoint/tests/src/Unit/BreakpointTest.php4
-rw-r--r--core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.breakpoints.yml14
-rw-r--r--core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php10
-rw-r--r--core/modules/responsive_image/config/schema/responsive_image.schema.yml46
-rw-r--r--core/modules/responsive_image/responsive_image.info.yml2
-rw-r--r--core/modules/responsive_image/responsive_image.links.action.yml8
-rw-r--r--core/modules/responsive_image/responsive_image.links.menu.yml8
-rw-r--r--core/modules/responsive_image/responsive_image.links.task.yml6
-rw-r--r--core/modules/responsive_image/responsive_image.module416
-rw-r--r--core/modules/responsive_image/responsive_image.routing.yml38
-rw-r--r--core/modules/responsive_image/src/Entity/ResponsiveImageMapping.php185
-rw-r--r--core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php224
-rw-r--r--core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php89
-rw-r--r--core/modules/responsive_image/src/ResponsiveImageMappingInterface.php98
-rw-r--r--core/modules/responsive_image/src/ResponsiveImageStyleForm.php (renamed from core/modules/responsive_image/src/ResponsiveImageMappingForm.php)90
-rw-r--r--core/modules/responsive_image/src/ResponsiveImageStyleInterface.php129
-rw-r--r--core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php (renamed from core/modules/responsive_image/src/ResponsiveImageMappingListBuilder.php)6
-rw-r--r--core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php102
-rw-r--r--core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php215
-rw-r--r--core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php136
-rw-r--r--core/modules/responsive_image/templates/responsive-image.html.twig30
-rw-r--r--core/modules/responsive_image/tests/modules/responsive_image_test_module/responsive_image_test_module.breakpoints.yml3
-rw-r--r--core/modules/responsive_image/tests/src/Unit/ResponsiveImageMappingConfigEntityUnitTest.php198
-rw-r--r--core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php339
-rw-r--r--core/modules/toolbar/toolbar.breakpoints.yml4
-rw-r--r--core/themes/bartik/bartik.breakpoints.yml4
-rw-r--r--core/themes/seven/seven.breakpoints.yml4
-rw-r--r--core/themes/stark/stark.breakpoints.yml4
33 files changed, 1622 insertions, 1032 deletions
diff --git a/core/assets/vendor/picturefill/picturefill.js b/core/assets/vendor/picturefill/picturefill.js
deleted file mode 100644
index 4d69569..0000000
--- a/core/assets/vendor/picturefill/picturefill.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*jshint loopfunc: true, browser: true, curly: true, eqeqeq: true, expr: true, forin: true, latedef: true, newcap: true, noarg: true, trailing: true, undef: true, unused: true */
-/*! Picturefill - Author: Scott Jehl, 2012 | License: MIT/GPLv2 */
-(function (w) {
-
- // Enable strict mode.
- "use strict";
-
- // Test if `<picture>` is supported natively, if so, exit.
- if (!!(w.document.createElement('picture') && w.document.createElement('source') && w.HTMLPictureElement)) {
- return;
- }
-
- w.picturefill = function () {
- // Copy attributes from the source to the destination.
- function _copyAttributes(src, tar) {
- if (src.getAttribute('width') && src.getAttribute('height')) {
- tar.width = src.getAttribute('width');
- tar.height = src.getAttribute('height');
- }
- }
-
- // Get all picture tags.
- var ps = w.document.getElementsByTagName('picture');
-
- // Loop the pictures.
- for (var i = 0, il = ps.length; i < il; i++) {
- var sources = ps[i].getElementsByTagName('source');
- var picImg = null;
- var matches = [];
-
- // If no sources are found, they're likely erased from the DOM.
- // Try finding them inside comments.
- if (!sources.length) {
- var picText = ps[i].innerHTML;
- var frag = w.document.createElement('div');
- // For IE9, convert the source elements to divs.
- var srcs = picText.replace(/(<)source([^>]+>)/gmi, '$1div$2').match(/<div[^>]+>/gmi);
-
- frag.innerHTML = srcs.join('');
- sources = frag.getElementsByTagName('div');
- }
-
- // See which sources match.
- for (var j = 0, jl = sources.length; j < jl; j++) {
- var media = sources[j].getAttribute('media');
- // If there's no media specified or the media query matches, add it.
- if (!media || (w.matchMedia && w.matchMedia(media).matches)) {
- matches.push(sources[j]);
- }
- }
-
- if (matches.length) {
- // Grab the most appropriate (last) match.
- var match = matches.pop();
- var srcset = match.getAttribute('srcset');
-
- // Find any existing img element in the picture element.
- picImg = ps[i].getElementsByTagName('img')[0];
-
- // Add a new img element if one doesn't exists.
- if (!picImg) {
- picImg = w.document.createElement('img');
- picImg.alt = ps[i].getAttribute('alt');
- ps[i].appendChild(picImg);
- }
-
- // Source element uses a srcset.
- if (srcset) {
- var screenRes = w.devicePixelRatio || 1;
- // Split comma-separated `srcset` sources into an array.
- sources = srcset.split(', ');
-
- // Loop through each source/resolution in srcset.
- for (var res = sources.length, r = res - 1; r >= 0; r--) {
- // Remove any leading whitespace, then split on spaces.
- var source = sources[ r ].replace(/^\s*/, '').replace(/\s*$/, '').split(' ');
- // Parse out the resolution for each source in `srcset`.
- var resMatch = parseFloat(source[1], 10);
-
- if (screenRes >= resMatch) {
- if (picImg.getAttribute('src') !== source[0]) {
- var newImg = document.createElement('img');
-
- newImg.src = source[0];
- // When the image is loaded, set a width equal to that of the
- // original’s intrinsic width divided by the screen resolution.
- newImg.onload = function () {
- // Clone the original image into memory so the width is
- // unaffected by page styles.
- var w = this.cloneNode(true).width;
- if (w > 0) {
- this.width = (w / resMatch);
- }
- };
- // Copy width and height from the source tag to the img element.
- _copyAttributes(match, newImg);
- picImg.parentNode.replaceChild(newImg, picImg);
- }
- // We’ve matched, so bail out of the loop here.
- break;
- }
- }
- } else {
- // No srcset used, so just use the 'src' value.
- picImg.src = match.getAttribute('src');
- // Copy width and height from the source tag to the img element.
- _copyAttributes(match, picImg);
- }
- }
- }
- };
-
- // Run on resize and domready (w.load as a fallback)
- if (w.addEventListener) {
- w.addEventListener('resize', w.picturefill, false);
- w.addEventListener('DOMContentLoaded', function () {
- w.picturefill();
- // Run once only.
- w.removeEventListener('load', w.picturefill, false);
- }, false);
- w.addEventListener('load', w.picturefill, false);
- }
- else if (w.attachEvent) {
- w.attachEvent('onload', w.picturefill);
- }
-})(this);
diff --git a/core/assets/vendor/picturefill/picturefill.min.js b/core/assets/vendor/picturefill/picturefill.min.js
new file mode 100644
index 0000000..7c0346b
--- /dev/null
+++ b/core/assets/vendor/picturefill/picturefill.min.js
@@ -0,0 +1,4 @@
+/*! Picturefill - v2.2.1 - 2015-02-03
+* http://scottjehl.github.io/picturefill
+* Copyright (c) 2015 https://github.com/scottjehl/picturefill/blob/master/Authors.txt; Licensed MIT */
+window.matchMedia||(window.matchMedia=function(){"use strict";var a=window.styleMedia||window.media;if(!a){var b=document.createElement("style"),c=document.getElementsByTagName("script")[0],d=null;b.type="text/css",b.id="matchmediajs-test",c.parentNode.insertBefore(b,c),d="getComputedStyle"in window&&window.getComputedStyle(b,null)||b.currentStyle,a={matchMedium:function(a){var c="@media "+a+"{ #matchmediajs-test { width: 1px; } }";return b.styleSheet?b.styleSheet.cssText=c:b.textContent=c,"1px"===d.width}}}return function(b){return{matches:a.matchMedium(b||"all"),media:b||"all"}}}()),function(a,b,c){"use strict";function d(a){var b,c,d,e,g,h=a||{};b=h.elements||f.getAllElements();for(var i=0,j=b.length;j>i;i++)if(c=b[i],d=c.parentNode,e=void 0,g=void 0,"IMG"===c.nodeName.toUpperCase()&&(c[f.ns]||(c[f.ns]={}),h.reevaluate||!c[f.ns].evaluated)){if("PICTURE"===d.nodeName.toUpperCase()){if(f.removeVideoShim(d),e=f.getMatch(c,d),e===!1)continue}else e=void 0;("PICTURE"===d.nodeName.toUpperCase()||c.srcset&&!f.srcsetSupported||!f.sizesSupported&&c.srcset&&c.srcset.indexOf("w")>-1)&&f.dodgeSrcset(c),e?(g=f.processSourceSet(e),f.applyBestCandidate(g,c)):(g=f.processSourceSet(c),(void 0===c.srcset||c[f.ns].srcset)&&f.applyBestCandidate(g,c)),c[f.ns].evaluated=!0}}function e(){function c(){var b;a._picturefillWorking||(a._picturefillWorking=!0,a.clearTimeout(b),b=a.setTimeout(function(){d({reevaluate:!0}),a._picturefillWorking=!1},60))}d();var e=setInterval(function(){return d(),/^loaded|^i|^c/.test(b.readyState)?void clearInterval(e):void 0},250);a.addEventListener?a.addEventListener("resize",c,!1):a.attachEvent&&a.attachEvent("onresize",c)}if(a.HTMLPictureElement)return void(a.picturefill=function(){});b.createElement("picture");var f={};f.ns="picturefill",function(){f.srcsetSupported="srcset"in c,f.sizesSupported="sizes"in c}(),f.trim=function(a){return a.trim?a.trim():a.replace(/^\s+|\s+$/g,"")},f.endsWith=function(a,b){return a.endsWith?a.endsWith(b):-1!==a.indexOf(b,a.length-b.length)},f.restrictsMixedContent=function(){return"https:"===a.location.protocol},f.matchesMedia=function(b){return a.matchMedia&&a.matchMedia(b).matches},f.getDpr=function(){return a.devicePixelRatio||1},f.getWidthFromLength=function(a){a=a&&a.indexOf("%")>-1==!1&&(parseFloat(a)>0||a.indexOf("calc(")>-1)?a:"100vw",a=a.replace("vw","%"),f.lengthEl||(f.lengthEl=b.createElement("div"),f.lengthEl.style.cssText="border:0;display:block;font-size:1em;left:0;margin:0;padding:0;position:absolute;visibility:hidden"),f.lengthEl.style.width=a,b.body.appendChild(f.lengthEl),f.lengthEl.className="helper-from-picturefill-js",f.lengthEl.offsetWidth<=0&&(f.lengthEl.style.width=b.documentElement.offsetWidth+"px");var c=f.lengthEl.offsetWidth;return b.body.removeChild(f.lengthEl),c},f.types={},f.types["image/jpeg"]=!0,f.types["image/gif"]=!0,f.types["image/png"]=!0,f.types["image/svg+xml"]=b.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Image","1.1"),f.types["image/webp"]=function(){var a="image/webp";c.onerror=function(){f.types[a]=!1,d()},c.onload=function(){f.types[a]=1===c.width,d()},c.src="data:image/webp;base64,UklGRh4AAABXRUJQVlA4TBEAAAAvAAAAAAfQ//73v/+BiOh/AAA="},f.verifyTypeSupport=function(a){var b=a.getAttribute("type");return null===b||""===b?!0:"function"==typeof f.types[b]?(f.types[b](),"pending"):f.types[b]},f.parseSize=function(a){var b=/(\([^)]+\))?\s*(.+)/g.exec(a);return{media:b&&b[1],length:b&&b[2]}},f.findWidthFromSourceSize=function(a){for(var b,c=f.trim(a).split(/\s*,\s*/),d=0,e=c.length;e>d;d++){var g=c[d],h=f.parseSize(g),i=h.length,j=h.media;if(i&&(!j||f.matchesMedia(j))){b=i;break}}return f.getWidthFromLength(b)},f.parseSrcset=function(a){for(var b=[];""!==a;){a=a.replace(/^\s+/g,"");var c,d=a.search(/\s/g),e=null;if(-1!==d){c=a.slice(0,d);var f=c.slice(-1);if((","===f||""===c)&&(c=c.replace(/,+$/,""),e=""),a=a.slice(d+1),null===e){var g=a.indexOf(",");-1!==g?(e=a.slice(0,g),a=a.slice(g+1)):(e=a,a="")}}else c=a,a="";(c||e)&&b.push({url:c,descriptor:e})}return b},f.parseDescriptor=function(a,b){var c,d=b||"100vw",e=a&&a.replace(/(^\s+|\s+$)/g,""),g=f.findWidthFromSourceSize(d);if(e)for(var h=e.split(" "),i=h.length-1;i>=0;i--){var j=h[i],k=j&&j.slice(j.length-1);if("h"!==k&&"w"!==k||f.sizesSupported){if("x"===k){var l=j&&parseFloat(j,10);c=l&&!isNaN(l)?l:1}}else c=parseFloat(parseInt(j,10)/g)}return c||1},f.getCandidatesFromSourceSet=function(a,b){for(var c=f.parseSrcset(a),d=[],e=0,g=c.length;g>e;e++){var h=c[e];d.push({url:h.url,resolution:f.parseDescriptor(h.descriptor,b)})}return d},f.dodgeSrcset=function(a){a.srcset&&(a[f.ns].srcset=a.srcset,a.removeAttribute("srcset"))},f.processSourceSet=function(a){var b=a.getAttribute("srcset"),c=a.getAttribute("sizes"),d=[];return"IMG"===a.nodeName.toUpperCase()&&a[f.ns]&&a[f.ns].srcset&&(b=a[f.ns].srcset),b&&(d=f.getCandidatesFromSourceSet(b,c)),d},f.applyBestCandidate=function(a,b){var c,d,e;a.sort(f.ascendingSort),d=a.length,e=a[d-1];for(var g=0;d>g;g++)if(c=a[g],c.resolution>=f.getDpr()){e=c;break}if(e&&!f.endsWith(b.src,e.url))if(f.restrictsMixedContent()&&"http:"===e.url.substr(0,"http:".length).toLowerCase())void 0!==typeof console&&console.warn("Blocked mixed content image "+e.url);else{b.src=e.url,b.currentSrc=b.src;var h=b.style||{},i="webkitBackfaceVisibility"in h,j=h.zoom;i&&(h.zoom=".999",i=b.offsetWidth,h.zoom=j)}},f.ascendingSort=function(a,b){return a.resolution-b.resolution},f.removeVideoShim=function(a){var b=a.getElementsByTagName("video");if(b.length){for(var c=b[0],d=c.getElementsByTagName("source");d.length;)a.insertBefore(d[0],c);c.parentNode.removeChild(c)}},f.getAllElements=function(){for(var a=[],c=b.getElementsByTagName("img"),d=0,e=c.length;e>d;d++){var g=c[d];("PICTURE"===g.parentNode.nodeName.toUpperCase()||null!==g.getAttribute("srcset")||g[f.ns]&&null!==g[f.ns].srcset)&&a.push(g)}return a},f.getMatch=function(a,b){for(var c,d=b.childNodes,e=0,g=d.length;g>e;e++){var h=d[e];if(1===h.nodeType){if(h===a)return c;if("SOURCE"===h.nodeName.toUpperCase()){null!==h.getAttribute("src")&&void 0!==typeof console&&console.warn("The `src` attribute is invalid on `picture` `source` element; instead, use `srcset`.");var i=h.getAttribute("media");if(h.getAttribute("srcset")&&(!i||f.matchesMedia(i))){var j=f.verifyTypeSupport(h);if(j===!0){c=h;break}if("pending"===j)return!1}}}}return c},e(),d._=f,"object"==typeof module&&"object"==typeof module.exports?module.exports=d:"function"==typeof define&&define.amd?define(function(){return d}):"object"==typeof a&&(a.picturefill=d)}(window,window.document,new window.Image);
diff --git a/core/core.libraries.yml b/core/core.libraries.yml
index 825ed77..9c29dda 100644
--- a/core/core.libraries.yml
+++ b/core/core.libraries.yml
@@ -834,15 +834,13 @@ normalize:
picturefill:
remote: https://github.com/scottjehl/picturefill
- # @todo Contribute upstream and/or replace with upstream version.
- # @see https://drupal.org/node/1775530
- version: VERSION
+ version: 2.2.1
license:
name: MIT
- url: https://github.com/scottjehl/picturefill/blob/master/LICENSE
+ url: https://github.com/scottjehl/picturefill/blob/2.2/LICENSE
gpl-compatible: true
js:
- assets/vendor/picturefill/picturefill.js: { weight: -10 }
+ assets/vendor/picturefill/picturefill.min.js: { weight: -10, minified: true }
dependencies:
- core/matchmedia
diff --git a/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
index a8a46f9..83986eb 100644
--- a/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
+++ b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php
@@ -33,54 +33,54 @@ class BreakpointDiscoveryTest extends KernelTestBase {
public function testThemeBreakpoints() {
// Verify the breakpoint group for breakpoint_theme_test was created.
$expected_breakpoints = array(
- 'breakpoint_theme_test.mobile' => array(
- 'label' => 'mobile',
- 'mediaQuery' => '(min-width: 0px)',
- 'weight' => 0,
- 'multipliers' => array(
- '1x',
- ),
- 'provider' => 'breakpoint_theme_test',
- 'id' => 'breakpoint_theme_test.mobile',
- 'group' => 'breakpoint_theme_test',
- 'class' => 'Drupal\\breakpoint\\Breakpoint',
+ 'breakpoint_theme_test.tv' => array(
+ 'label' => 'tv',
+ 'mediaQuery' => 'only screen and (min-width: 1220px)',
+ 'weight' => 0,
+ 'multipliers' => array(
+ '1x',
),
- 'breakpoint_theme_test.narrow' => array(
- 'label' => 'narrow',
- 'mediaQuery' => '(min-width: 560px)',
- 'weight' => 1,
- 'multipliers' => array(
- '1x',
- ),
- 'provider' => 'breakpoint_theme_test',
- 'id' => 'breakpoint_theme_test.narrow',
- 'group' => 'breakpoint_theme_test',
- 'class' => 'Drupal\\breakpoint\\Breakpoint',
+ 'provider' => 'breakpoint_theme_test',
+ 'id' => 'breakpoint_theme_test.tv',
+ 'group' => 'breakpoint_theme_test',
+ 'class' => 'Drupal\\breakpoint\\Breakpoint',
+ ),
+ 'breakpoint_theme_test.wide' => array(
+ 'label' => 'wide',
+ 'mediaQuery' => '(min-width: 851px)',
+ 'weight' => 1,
+ 'multipliers' => array(
+ '1x',
),
- 'breakpoint_theme_test.wide' => array(
- 'label' => 'wide',
- 'mediaQuery' => '(min-width: 851px)',
- 'weight' => 2,
- 'multipliers' => array(
- '1x',
- ),
- 'provider' => 'breakpoint_theme_test',
- 'id' => 'breakpoint_theme_test.wide',
- 'group' => 'breakpoint_theme_test',
- 'class' => 'Drupal\\breakpoint\\Breakpoint',
+ 'provider' => 'breakpoint_theme_test',
+ 'id' => 'breakpoint_theme_test.wide',
+ 'group' => 'breakpoint_theme_test',
+ 'class' => 'Drupal\\breakpoint\\Breakpoint',
+ ),
+ 'breakpoint_theme_test.narrow' => array(
+ 'label' => 'narrow',
+ 'mediaQuery' => '(min-width: 560px)',
+ 'weight' => 2,
+ 'multipliers' => array(
+ '1x',
),
- 'breakpoint_theme_test.tv' => array(
- 'label' => 'tv',
- 'mediaQuery' => 'only screen and (min-width: 3456px)',
- 'weight' => 3,
- 'multipliers' => array(
- '1x',
- ),
- 'provider' => 'breakpoint_theme_test',
- 'id' => 'breakpoint_theme_test.tv',
- 'group' => 'breakpoint_theme_test',
- 'class' => 'Drupal\\breakpoint\\Breakpoint',
+ 'provider' => 'breakpoint_theme_test',
+ 'id' => 'breakpoint_theme_test.narrow',
+ 'group' => 'breakpoint_theme_test',
+ 'class' => 'Drupal\\breakpoint\\Breakpoint',
+ ),
+ 'breakpoint_theme_test.mobile' => array(
+ 'label' => 'mobile',
+ 'mediaQuery' => '(min-width: 0px)',
+ 'weight' => 3,
+ 'multipliers' => array(
+ '1x',
),
+ 'provider' => 'breakpoint_theme_test',
+ 'id' => 'breakpoint_theme_test.mobile',
+ 'group' => 'breakpoint_theme_test',
+ 'class' => 'Drupal\\breakpoint\\Breakpoint',
+ ),
);
$breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup('breakpoint_theme_test');
@@ -101,7 +101,7 @@ class BreakpointDiscoveryTest extends KernelTestBase {
'breakpoint_theme_test.group2.narrow' => array(
'label' => 'narrow',
'mediaQuery' => '(min-width: 560px)',
- 'weight' => 1,
+ 'weight' => 2,
'multipliers' => array(
'1x',
'2x',
@@ -114,7 +114,7 @@ class BreakpointDiscoveryTest extends KernelTestBase {
'breakpoint_theme_test.group2.wide' => array(
'label' => 'wide',
'mediaQuery' => '(min-width: 851px)',
- 'weight' => 2,
+ 'weight' => 1,
'multipliers' => array(
'1x',
'2x',
@@ -127,7 +127,7 @@ class BreakpointDiscoveryTest extends KernelTestBase {
'breakpoint_module_test.breakpoint_theme_test.group2.tv' => array(
'label' => 'tv',
'mediaQuery' => '(min-width: 6000px)',
- 'weight' => 3,
+ 'weight' => 0,
'multipliers' => array(
'1x',
),
@@ -152,7 +152,7 @@ class BreakpointDiscoveryTest extends KernelTestBase {
'breakpoint_module_test.mobile' => array(
'label' => 'mobile',
'mediaQuery' => '(min-width: 0px)',
- 'weight' => 0,
+ 'weight' => 1,
'multipliers' => array(
'1x',
),
@@ -164,7 +164,7 @@ class BreakpointDiscoveryTest extends KernelTestBase {
'breakpoint_module_test.standard' => array(
'label' => 'standard',
'mediaQuery' => '(min-width: 560px)',
- 'weight' => 1,
+ 'weight' => 0,
'multipliers' => array(
'1x',
'2x',
diff --git a/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.breakpoints.yml b/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.breakpoints.yml
index 0c24709..e1edeb2 100644
--- a/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.breakpoints.yml
+++ b/core/modules/breakpoint/tests/modules/breakpoint_module_test/breakpoint_module_test.breakpoints.yml
@@ -1,12 +1,12 @@
breakpoint_module_test.mobile:
label: mobile
mediaQuery: '(min-width: 0px)'
- weight: 0
+ weight: 1
# Don't include multipliers. A 1x multiplier this will be enforced by default.
breakpoint_module_test.standard:
label: standard
mediaQuery: '(min-width: 560px)'
- weight: 1
+ weight: 0
# Don't include a 1x multiplier this will be enforced by default.
multipliers:
- 2x
@@ -15,7 +15,7 @@ breakpoint_module_test.standard:
breakpoint_module_test.breakpoint_theme_test.group2.tv:
label: tv
mediaQuery: '(min-width: 6000px)'
- weight: 3
+ weight: 0
multipliers:
- 1x
group: breakpoint_theme_test.group2
diff --git a/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php b/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php
index f4b2a0b..fea2d8f 100644
--- a/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php
+++ b/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php
@@ -87,9 +87,9 @@ class BreakpointTest extends UnitTestCase {
* @covers ::getMediaQuery
*/
public function testGetMediaQuery() {
- $this->pluginDefinition['mediaQuery'] = 'only screen and (min-width: 3456px)';
+ $this->pluginDefinition['mediaQuery'] = 'only screen and (min-width: 1220px)';
$this->setupBreakpoint();
- $this->assertEquals('only screen and (min-width: 3456px)', $this->breakpoint->getMediaQuery());
+ $this->assertEquals('only screen and (min-width: 1220px)', $this->breakpoint->getMediaQuery());
}
/**
diff --git a/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.breakpoints.yml b/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.breakpoints.yml
index 6d34ec7..3e565e1 100644
--- a/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.breakpoints.yml
+++ b/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.breakpoints.yml
@@ -1,32 +1,32 @@
breakpoint_theme_test.mobile:
label: mobile
mediaQuery: '(min-width: 0px)'
- weight: 0
+ weight: 3
multipliers:
- 1x
breakpoint_theme_test.narrow:
label: narrow
mediaQuery: '(min-width: 560px)'
- weight: 1
+ weight: 2
multipliers:
- 1x
# Out of order breakpoint to test sorting.
breakpoint_theme_test.tv:
label: tv
- mediaQuery: 'only screen and (min-width: 3456px)'
- weight: 3
+ mediaQuery: 'only screen and (min-width: 1220px)'
+ weight: 0
multipliers:
- 1x
breakpoint_theme_test.wide:
label: wide
mediaQuery: '(min-width: 851px)'
- weight: 2
+ weight: 1
multipliers:
- 1x
breakpoint_theme_test.group2.narrow:
label: narrow
mediaQuery: '(min-width: 560px)'
- weight: 1
+ weight: 2
multipliers:
- 1x
- 2x
@@ -34,7 +34,7 @@ breakpoint_theme_test.group2.narrow:
breakpoint_theme_test.group2.wide:
label: wide
mediaQuery: '(min-width: 851px)'
- weight: 2
+ weight: 1
multipliers:
- 1x
- 2x
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
index 999ebb5..d59bd7f 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
@@ -363,13 +363,13 @@ class ConfigTranslationListUiTest extends WebTestBase {
$edit['label'] = $this->randomMachineName();
$edit['id'] = strtolower($edit['label']);
- $this->drupalPostForm('admin/config/media/responsive-image-mapping/add', $edit, t('Save'));
- $this->assertRaw(t('Responsive image mapping %label saved.', array('%label' => $edit['label'])));
+ $this->drupalPostForm('admin/config/media/responsive-image-style/add', $edit, t('Save'));
+ $this->assertRaw(t('Responsive image style %label saved.', array('%label' => $edit['label'])));
- // Get the responsive image mapping listing.
- $this->drupalGet('admin/config/media/responsive-image-mapping');
+ // Get the responsive image style listing.
+ $this->drupalGet('admin/config/media/responsive-image-style');
- $translate_link = 'admin/config/media/responsive-image-mapping/' . $edit['id'] . '/translate';
+ $translate_link = 'admin/config/media/responsive-image-style/' . $edit['id'] . '/translate';
// Test if the link to translate the style is on the page.
$this->assertLinkByHref($translate_link);
diff --git a/core/modules/responsive_image/config/schema/responsive_image.schema.yml b/core/modules/responsive_image/config/schema/responsive_image.schema.yml
index f953796..fb3b9a0 100644
--- a/core/modules/responsive_image/config/schema/responsive_image.schema.yml
+++ b/core/modules/responsive_image/config/schema/responsive_image.schema.yml
@@ -1,8 +1,8 @@
# Schema for the configuration files of the Responsive Image module.
-responsive_image.mappings.*:
+responsive_image.styles.*:
type: config_entity
- label: 'Responsive image mapping'
+ label: 'Responsive image style'
mapping:
id:
type: string
@@ -10,33 +10,57 @@ responsive_image.mappings.*:
label:
type: label
label: 'Label'
- mappings:
+ image_style_mappings:
type: sequence
- label: 'Mappings'
+ label: 'Image style mappings'
sequence:
- type: mapping
- label: 'Mapping'
+ label: 'Image style mapping'
mapping:
+ # Image mapping type. Either 'sizes' (using the 'sizes' attribute)
+ # or 'image_style' (using a single image style to map to this
+ # breakpoint).
+ image_mapping_type:
+ type: string
+ label: 'Responsive image mapping type'
+ image_mapping:
+ type: responsive_image.image_mapping_type.[%parent.image_mapping_type]
breakpoint_id:
type: string
label: 'Breakpoint ID'
multiplier:
type: string
label: 'Multiplier'
- image_style:
- type: string
- label: 'Image style'
- breakpointGroup:
+ breakpoint_group:
type: string
label: 'Breakpoint group'
+responsive_image.image_mapping_type.image_style:
+ type: string
+ label: 'Image style'
+
+responsive_image.image_mapping_type.sizes:
+ type: mapping
+ mapping:
+ # The value for the sizes attribute as described in the spec:
+ # http://www.w3.org/html/wg/drafts/html/master/embedded-content.html#attr-img-sizes
+ sizes:
+ type: string
+ label: 'Sizes attribute'
+ sizes_image_styles:
+ type: sequence
+ label: 'Image styles to be used when using the ''sizes'' attribute'
+ sequence:
+ - type: string
+ label: 'Image style'
+
field.formatter.settings.responsive_image:
type: mapping
label: 'Responsive image list format settings'
mapping:
- responsive_image_mapping:
+ responsive_image_style:
type: string
- label: 'Responsive image mapping'
+ label: 'Responsive image style'
fallback_image_style:
type: string
label: 'Fallback image style'
diff --git a/core/modules/responsive_image/responsive_image.info.yml b/core/modules/responsive_image/responsive_image.info.yml
index dec6fee..00304ef 100644
--- a/core/modules/responsive_image/responsive_image.info.yml
+++ b/core/modules/responsive_image/responsive_image.info.yml
@@ -7,4 +7,4 @@ core: 8.x
dependencies:
- breakpoint
- image
-configure: entity.responsive_image_mapping.collection
+configure: entity.responsive_image_style.collection
diff --git a/core/modules/responsive_image/responsive_image.links.action.yml b/core/modules/responsive_image/responsive_image.links.action.yml
index 6308cd1..349eea4 100644
--- a/core/modules/responsive_image/responsive_image.links.action.yml
+++ b/core/modules/responsive_image/responsive_image.links.action.yml
@@ -1,5 +1,5 @@
-responsive_image.mapping_page_add:
- route_name: responsive_image.mapping_page_add
- title: 'Add responsive image mapping'
+responsive_image.style_page_add:
+ route_name: responsive_image.style_page_add
+ title: 'Add responsive image style'
appears_on:
- - entity.responsive_image_mapping.collection
+ - entity.responsive_image_style.collection
diff --git a/core/modules/responsive_image/responsive_image.links.menu.yml b/core/modules/responsive_image/responsive_image.links.menu.yml
index c72d4ee..e361e25 100644
--- a/core/modules/responsive_image/responsive_image.links.menu.yml
+++ b/core/modules/responsive_image/responsive_image.links.menu.yml
@@ -1,6 +1,6 @@
-entity.responsive_image_mapping.collection:
- title: 'Responsive image mappings'
- description: 'Manage responsive image mappings'
+entity.responsive_image_style.collection:
+ title: 'Responsive image styles'
+ description: 'Manage responsive image styles'
weight: 10
- route_name: entity.responsive_image_mapping.collection
+ route_name: entity.responsive_image_style.collection
parent: system.admin_config_media
diff --git a/core/modules/responsive_image/responsive_image.links.task.yml b/core/modules/responsive_image/responsive_image.links.task.yml
index 602182e..d5e69d6 100644
--- a/core/modules/responsive_image/responsive_image.links.task.yml
+++ b/core/modules/responsive_image/responsive_image.links.task.yml
@@ -1,5 +1,5 @@
-entity.responsive_image_mapping.edit_form:
+entity.responsive_image_style.edit_form:
title: Edit
- route_name: entity.responsive_image_mapping.edit_form
- base_route: entity.responsive_image_mapping.edit_form
+ route_name: entity.responsive_image_style.edit_form
+ base_route: entity.responsive_image_style.edit_form
weight: -10
diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module
index 7a48c0d..f7e2192 100644
--- a/core/modules/responsive_image/responsive_image.module
+++ b/core/modules/responsive_image/responsive_image.module
@@ -9,8 +9,12 @@ use Drupal\Component\Utility\SafeMarkup;
use Drupal\Component\Utility\Unicode;
use Drupal\Core\Routing\RouteMatchInterface;
use \Drupal\Core\Template\Attribute;
+use Drupal\image\Entity\ImageStyle;
use Drupal\Core\Url;
-use Drupal\responsive_image\Entity\ResponsiveImageMapping;
+use Drupal\responsive_image\Entity\ResponsiveImageStyle;
+use Drupal\Core\Image\ImageInterface;
+use Drupal\Component\Utility\String;
+use Drupal\breakpoint\BreakpointInterface;
/**
* The machine name for the empty image breakpoint image style option.
@@ -28,15 +32,15 @@ function responsive_image_help($route_name, RouteMatchInterface $route_match) {
$output .= '<p>' . t('The Responsive Image module provides an image formatter and breakpoint mappings to output responsive images using the HTML5 picture tag. For more information, see the <a href="!responsive_image">online documentation for the Responsive Image module</a>.', array( '!responsive_image' => 'https://drupal.org/documentation/modules/responsive_image')) . '</p>';
$output .= '<h3>' . t('Uses') . '</h3>';
$output .= '<dl>';
- $output .= '<dt>' . t('Defining responsive image mappings') . '</dt>';
- $output .= '<dd>' . t('By creating responsive image mappings you define the image styles that are being used to output images at certain breakpoints. On the <a href="!responsive_image_mapping">Responsive image mappings</a> page, click <em>Add responsive image mapping</em> to create a new mapping. First chose a label and a breakpoint group and click Save. After that you can choose the image styles that will be used for each breakpoint. Image styles can be defined on the <a href="!image_styles">Image styles page</a> that is provided by the <a href="!image_help">Image module</a>. Breakpoints are defined in the configuration files of the theme. See the <a href="!breakpoint_help">help page of the Breakpoint module</a> for more information.', array('!responsive_image_mapping' => \Drupal::url('entity.responsive_image_mapping.collection'), '!image_styles' => \Drupal::url('entity.image_style.collection'),'!image_help' => \Drupal::url('help.page', array('name' => 'image')), '!breakpoint_help' => \Drupal::url('help.page', array('name' => 'breakpoint')))) . '</dd>';
- $output .= '<dt>' . t('Using responsive image mappings in Image fields') . '</dt>';
- $output .= '<dd>' . t('After defining responsive image mappings, you can use them in the display settings for your Image fields, so that the site displays responsive images using the HTML5 picture tag. Open the Manage display page for the entity type (content type, taxonomy vocabulary, etc.) that the Image field is attached to. Choose the format <em>Responsive image</em>, click the Edit icon, and select one of the responsive image mappings that you have created. For general information on how to manage fields and their display see the <a href="!field_ui">Field UI module help page</a>. For background information about entities and fields see the <a href="!field_help">Field module help page</a>.', array('!field_ui' => \Drupal::url('help.page', array('name' => 'field_ui')),'!field_help' => \Drupal::url('help.page', array('name' => 'field')))) . '</dd>';
+ $output .= '<dt>' . t('Defining responsive image styles') . '</dt>';
+ $output .= '<dd>' . t('By creating responsive image styles you define the image styles that are being used to output images at certain breakpoints. On the <a href="!responsive_image_style">Responsive image styles</a> page, click <em>Add responsive image style</em> to create a new style. First chose a label and a breakpoint group and click Save. After that you can choose the image styles that will be used for each breakpoint. Image styles can be defined on the <a href="!image_styles">Image styles page</a> that is provided by the <a href="!image_help">Image module</a>. Breakpoints are defined in the configuration files of the theme. See the <a href="!breakpoint_help">help page of the Breakpoint module</a> for more information.', array('!responsive_image_style' => \Drupal::url('entity.responsive_image_style.collection'), '!image_styles' => \Drupal::url('entity.image_style.collection'),'!image_help' => \Drupal::url('help.page', array('name' => 'image')), '!breakpoint_help' => \Drupal::url('help.page', array('name' => 'breakpoint')))) . '</dd>';
+ $output .= '<dt>' . t('Using responsive image styles in Image fields') . '</dt>';
+ $output .= '<dd>' . t('After defining responsive image styles, you can use them in the display settings for your Image fields, so that the site displays responsive images using the HTML5 picture tag. Open the Manage display page for the entity type (content type, taxonomy vocabulary, etc.) that the Image field is attached to. Choose the format <em>Responsive image</em>, click the Edit icon, and select one of the responsive image styles that you have created. For general information on how to manage fields and their display see the <a href="!field_ui">Field UI module help page</a>. For background information about entities and fields see the <a href="!field_help">Field module help page</a>.', array('!field_ui' => \Drupal::url('help.page', array('name' => 'field_ui')),'!field_help' => \Drupal::url('help.page', array('name' => 'field')))) . '</dd>';
$output .= '</dl>';
break;
- case 'entity.responsive_image_mapping.collection':
- $output .= '<p>' . t('A responsive image mapping associates an image style with each breakpoint defined by your theme.') . '</p>';
+ case 'entity.responsive_image_style.collection':
+ $output .= '<p>' . t('A responsive image style associates an image style with each breakpoint defined by your theme.') . '</p>';
break;
}
@@ -49,19 +53,19 @@ function responsive_image_help($route_name, RouteMatchInterface $route_match) {
function responsive_image_menu() {
$items = array();
- $items['admin/config/media/responsive-image-mapping'] = array(
- 'title' => 'Responsive image mappings',
- 'description' => 'Manage responsive image mappings',
+ $items['admin/config/media/responsive-image-style'] = array(
+ 'title' => 'Responsive image styles',
+ 'description' => 'Manage responsive image styles',
'weight' => 10,
- 'route_name' => 'entity.responsive_image_mapping.collection',
+ 'route_name' => 'entity.responsive_image_style.collection',
);
- $items['admin/config/media/responsive-image-mapping/%responsive_image_mapping'] = array(
- 'title' => 'Edit responsive image mapping',
- 'route_name' => 'entity.responsive_image_mapping.edit_form',
+ $items['admin/config/media/responsive-image-style/%responsive_image_style'] = array(
+ 'title' => 'Edit responsive image style',
+ 'route_name' => 'entity.responsive_image_style.edit_form',
);
- $items['admin/config/media/responsive-image-mapping/%responsive_image_mapping/duplicate'] = array(
- 'title' => 'Duplicate responsive image mapping',
- 'route_name' => 'entity.responsive_image_mapping.duplicate_form',
+ $items['admin/config/media/responsive-image-style/%responsive_image_style/duplicate'] = array(
+ 'title' => 'Duplicate responsive image style',
+ 'route_name' => 'entity.responsive_image_style.duplicate_form',
);
return $items;
@@ -81,28 +85,18 @@ function responsive_image_theme() {
'alt' => '',
'title' => NULL,
'attributes' => array(),
- 'mapping_id' => array(),
+ 'responsive_image_style_id' => array(),
),
- 'function' => 'theme_responsive_image',
),
'responsive_image_formatter' => array(
'variables' => array(
'item' => NULL,
'url' => NULL,
'image_style' => NULL,
- 'mapping_id' => array(),
+ 'responsive_image_style_id' => array(),
),
'function' => 'theme_responsive_image_formatter',
),
- 'responsive_image_source' => array(
- 'variables' => array(
- 'src' => NULL,
- 'srcset' => NULL,
- 'dimensions' => NULL,
- 'media' => NULL,
- ),
- 'function' => 'theme_responsive_image_source',
- ),
);
}
@@ -113,14 +107,14 @@ function responsive_image_theme() {
* An associative array containing:
* - item: An ImageItem object.
* - image_style: An optional image style.
- * - path: An optional array containing the link 'path' and link 'options'.
- * - mapping_id: The ID of the responsive image mapping.
+ * - responsive_image_style_id: The ID of the responsive image style.
+ * - url: An optional \Drupal\Core\Url object.
*
* @ingroup themeable
*/
function theme_responsive_image_formatter($variables) {
$item = $variables['item'];
- if (!isset($variables['mapping_id']) || empty($variables['mapping_id'])) {
+ if (!isset($variables['responsive_image_style_id']) || empty($variables['responsive_image_style_id'])) {
$image_formatter = array(
'#theme' => 'image_formatter',
'#item' => $item,
@@ -135,7 +129,7 @@ function theme_responsive_image_formatter($variables) {
'#width' => $item->width,
'#height' => $item->height,
'#style_name' => $variables['image_style'],
- '#mapping_id' => $variables['mapping_id'],
+ '#responsive_image_style_id' => $variables['responsive_image_style_id'],
);
if (isset($item->uri)) {
$responsive_image['#uri'] = $item->uri;
@@ -148,19 +142,17 @@ function theme_responsive_image_formatter($variables) {
if (Unicode::strlen($item->title) != 0) {
$responsive_image['#title'] = $item->title;
}
- // @todo Add support for route names.
- if (isset($variables['path']['path'])) {
- $path = $variables['path']['path'];
- $options = isset($variables['path']['options']) ? $variables['path']['options'] : array();
- $options['html'] = TRUE;
- return \Drupal::l($responsive_image, Url::fromUri($path, $options));
+ if (isset($variables['url'])) {
+ return \Drupal::l($responsive_image, $variables['url']->setOption('html', TRUE));
}
return drupal_render($responsive_image);
}
/**
- * Returns HTML for a responsive image.
+ * Prepares variables for a responsive image.
+ *
+ * Default template: responsive-image.html.twig.
*
* @param $variables
* An associative array containing:
@@ -171,12 +163,13 @@ function theme_responsive_image_formatter($variables) {
* - alt: The alternative text for text-based browsers.
* - title: The title text is displayed when the image is hovered in some
* popular browsers.
+ * - attributes: Associative array of attributes to be placed in the img tag.
* - style_name: The name of the style to be used as a fallback image.
- * - mapping_id: The ID of the responsive image mapping.
+ * - responsive_image_style_id: The ID of the responsive image style.
*
* @ingroup themeable
*/
-function theme_responsive_image($variables) {
+function template_preprocess_responsive_image(&$variables) {
// Make sure that width and height are proper values
// If they exists we'll output them
// @see http://www.w3.org/community/respimg/2012/06/18/florians-compromise/
@@ -189,114 +182,243 @@ function theme_responsive_image($variables) {
unset($variables['height']);
}
- $sources = array();
-
- // Fallback image, output as source with media query.
- $sources[] = array(
- 'src' => _responsive_image_image_style_url($variables['style_name'], $variables['uri']),
- 'dimensions' => responsive_image_get_image_dimensions($variables),
- );
- $responsive_image_mapping = ResponsiveImageMapping::load($variables['mapping_id']);
+ $image = \Drupal::service('image.factory')->get($variables['uri']);
+ $responsive_image_style = ResponsiveImageStyle::load($variables['responsive_image_style_id']);
// All breakpoints and multipliers.
- $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup($responsive_image_mapping->getBreakpointGroup());
- foreach ($responsive_image_mapping->getKeyedMappings() as $breakpoint_id => $multipliers) {
+ $breakpoints = \Drupal::service('breakpoint.manager')->getBreakpointsByGroup($responsive_image_style->getBreakpointGroup());
+ foreach ($responsive_image_style->getKeyedImageStyleMappings() as $breakpoint_id => $multipliers) {
if (isset($breakpoints[$breakpoint_id])) {
- $breakpoint = $breakpoints[$breakpoint_id];
- $new_sources = array();
- foreach ($multipliers as $multiplier => $image_style) {
- $new_source = $variables;
- $new_source['style_name'] = $image_style;
- $new_source['#multiplier'] = $multiplier;
- $new_sources[] = $new_source;
- }
-
- // Only one image, use src.
- if (count($new_sources) == 1) {
- $sources[] = array(
- 'src' => _responsive_image_image_style_url($new_sources[0]['style_name'], $new_sources[0]['uri']),
- 'dimensions' => responsive_image_get_image_dimensions($new_sources[0]),
- 'media' => $breakpoint->getMediaQuery(),
- );
- }
- else {
- // Multiple images, use srcset.
- $srcset = array();
- foreach ($new_sources as $new_source) {
- $srcset[] = _responsive_image_image_style_url($new_source['style_name'], $new_source['uri']) . ' ' . $new_source['#multiplier'];
- }
- $sources[] = array(
- 'srcset' => implode(', ', $srcset),
- 'dimensions' => responsive_image_get_image_dimensions($new_sources[0]),
- 'media' => $breakpoint->getMediaQuery(),
- );
- }
+ $variables['sources'][] = responsive_image_build_source_attributes($image, $variables, $breakpoints[$breakpoint_id], $multipliers);
}
}
-
- if (!empty($sources)) {
- $output = array();
- $output[] = '<picture>';
-
- // Add source tags to the output.
- foreach ($sources as $source) {
- $responsive_image_source = array(
- '#theme' => 'responsive_image_source',
- '#src' => $source['src'],
- '#dimensions' => $source['dimensions'],
- );
- if (isset($source['media'])) {
- $responsive_image_source['#media'] = $source['media'];
- }
- if (isset($source['srcset'])) {
- $responsive_image_source['#srcset'] = $source['srcset'];
- }
- $output[] = drupal_render($responsive_image_source);
+ // Prepare the fallback image. Use srcset in the fallback image to avoid
+ // unnecessary preloading of images in older browsers. See
+ // http://scottjehl.github.io/picturefill/#using-picture and
+ // http://scottjehl.github.io/picturefill/#gotchas for more information.
+ $variables['img_element'] = array(
+ '#theme' => 'image',
+ '#srcset' => array(
+ array(
+ 'uri' => _responsive_image_image_style_url($variables['style_name'], $image->getSource()),
+ ),
+ ),
+ );
+ foreach (array('alt', 'title', 'attributes') as $key) {
+ if (isset($variables[$key])) {
+ $variables['img_element']["#$key"] = $variables[$key];
+ unset($variables[$key]);
}
-
- $output[] = '</picture>';
- return SafeMarkup::set(implode("\n", $output));
}
}
/**
- * Returns HTML for a source tag.
+ * Helper function for template_preprocess_responsive_image().
+ *
+ * Builds an array of attributes for <source> tags to be used in a <picture>
+ * tag. In other words, this function provides the attributes for each <source>
+ * tag in a <picture> tag.
+ *
+ * In a responsive image style, each breakpoint has an image style mapping for
+ * each of its multipliers. An image style mapping can be either of two types:
+ * 'sizes' (meaning it will output a <source> tag with the 'sizes' attribute) or
+ * 'image_style' (meaning it will output a <source> tag based on the selected
+ * image style for this breakpoint and multiplier). A responsive image style
+ * can contain image style mappings of mixed types (both 'image_style' and
+ * 'sizes'). For example:
+ * @code
+ * $responsive_img_style = ResponsiveImageStyle::create(array(
+ * 'id' => 'style_one',
+ * 'label' => 'Style One',
+ * 'breakpoint_group' => 'responsive_image_test_module',
+ * ));
+ * $responsive_img_style->addImageStyleMapping('responsive_image_test_module.mobile', '1x', array(
+ * 'image_mapping_type' => 'image_style',
+ * 'image_mapping' => 'thumbnail',
+ * ))
+ * ->addImageStyleMapping('responsive_image_test_module.narrow', '1x', array(
+ * 'image_mapping_type' => 'sizes',
+ * 'image_mapping' => array(
+ * 'sizes' => '(min-width: 700px) 700px, 100vw',
+ * 'sizes_image_styles' => array(
+ * 'large' => 'large',
+ * 'medium' => 'medium',
+ * ),
+ * ),
+ * ))
+ * ->save();
+ * @endcode
+ * The above responsive image style will result in a <picture> tag like this:
+ * @code
+ * <picture>
+ * <source media="(min-width: 0px)" srcset="sites/default/files/styles/thumbnail/image.jpeg" />
+ * <source media="(min-width: 560px)" sizes="(min-width: 700px) 700px, 100vw" srcset="sites/default/files/styles/large/image.jpeg 480w, sites/default/files/styles/medium/image.jpeg 220w" />
+ * <img srcset="fallback.jpeg" />
+ * </picture>
+ * @endcode
+ *
+ * When all the images in the 'srcset' attribute of a <source> tag have the same
+ * MIME type, the source tag will get a 'mime-type' attribute as well. This way
+ * we can gain some front-end performance because browsers can select which
+ * image (<source> tag) to load based on the MIME types they support (which, for
+ * instance, can be beneficial for browsers supporting WebP).
+ * For example:
+ * A <source> tag can contain multiple images:
+ * @code
+ * <source [...] srcset="image1.jpeg 1x, image2.jpeg 2x, image3.jpeg 3x" />
+ * @endcode
+ * In the above example we can add the 'mime-type' attribute ('image/jpeg')
+ * since all images in the 'srcset' attribute of the <source> tag have the same
+ * MIME type.
+ * If a <source> tag were to look like this:
+ * @code
+ * <source [...] srcset="image1.jpeg 1x, image2.webp 2x, image3.jpeg 3x" />
+ * @endcode
+ * We can't add the 'mime-type' attribute ('image/jpeg' vs 'image/webp'). So in
+ * order to add the 'mime-type' attribute to the <source> tag all images in the
+ * 'srcset' attribute of the <source> tag need to be of the same MIME type. This
+ * way, a <picture> tag could look like this:
+ * @code
+ * <picture>
+ * <source [...] mime-type="image/webp" srcset="image1.webp 1x, image2.webp 2x, image3.webp 3x"/>
+ * <source [...] mime-type="image/jpeg" srcset="image1.jpeg 1x, image2.jpeg 2x, image3.jpeg 3x"/>
+ * <img srcset="fallback.jpeg" />
+ * </picture>
+ * @endcode
+ * This way a browser can decide which <source> tag is preferred based on the
+ * MIME type. In other words, the MIME types of all images in one <source> tag
+ * need to be the same in order to set the 'mime-type' attribute but not all
+ * MIME types within the <picture> tag need to be the same.
+ *
+ * For image style mappings of the type 'sizes', a width descriptor is added to
+ * each source. For example:
+ * @code
+ * <source media="(min-width: 0px)" srcset="image1.jpeg 100w" />
+ * @endcode
+ * The width descriptor here is "100w". This way the browser knows this image is
+ * 100px wide without having to load it. According to the spec, a multiplier can
+ * not be present if a width descriptor is.
+ * For example:
+ * Valid:
+ * @code
+ * <source media="(min-width:0px)" srcset="img1.jpeg 50w, img2.jpeg=100w" />
+ * @endcode
+ * Invalid:
+ * @code
+ * <source media="(min-width:0px)" srcset="img1.jpeg 50w 1x, img2.jpeg=100w 1x" />
+ * @endcode
+ *
+ * Note: Since the specs do not allow width descriptors and multipliers combined
+ * inside one 'srcset' attribute, we either have to use something like
+ * @code
+ * <source [...] srcset="image1.jpeg 1x, image2.webp 2x, image3.jpeg 3x" />
+ * @endcode
+ * to support multipliers or
+ * @code
+ * <source [...] sizes"(min-width: 40em) 80vw, 100vw" srcset="image1.jpeg 300w, image2.webp 600w, image3.jpeg 1200w" />
+ * @endcode
+ * to support the 'sizes' attribute.
+ *
+ * In theory people could add an image style mapping for the same breakpoint
+ * (but different multiplier) so the array contains an entry for breakpointA.1x
+ * and breakpointA.2x. If we would output those we will end up with something
+ * like
+ * @code
+ * <source [...] sizes="(min-width: 40em) 80vw, 100vw" srcset="a1.jpeg 300w 1x, a2.jpeg 600w 1x, a3.jpeg 1200w 1x, b1.jpeg 250w 2x, b2.jpeg 680w 2x, b3.jpeg 1240w 2x" />
+ * @endcode
+ * which is illegal. So the solution is to merge both arrays into one and
+ * disregard the multiplier. Which, in this case, would output
+ * @code
+ * <source [...] sizes="(min-width: 40em) 80vw, 100vw" srcset="b1.jpeg 250w, a1.jpeg 300w, a2.jpeg 600w, b2.jpeg 680w, a3.jpeg 1200w, b3.jpeg 1240w" />
+ * @endcode
+ * See http://www.w3.org/html/wg/drafts/html/master/embedded-content.html#image-candidate-string
+ * for further information.
*
+ * @param \Drupal\Core\Image\ImageInterface $image
+ * The image to build the <source> tags for.
* @param array $variables
- * An associative array containing:
- * - media: The media query to use.
- * - srcset: The srcset containing the path of the image file or a full
- * URL and optionally multipliers.
- * - src: Either the path of the image file (relative to base_path()) or a
- * full URL.
- * - dimensions: The width and height of the image (if known).
+ * An array with the following keys:
+ * - responsive_image_style_id: The \Drupal\responsive_image\Entity\ResponsiveImageStyle
+ * ID.
+ * - width: The width of the image (if known).
+ * - height: The height of the image (if known).
+ * @param \Drupal\breakpoint\BreakpointInterface $breakpoint
+ * The breakpoint for this source tag.
+ * @param array $multipliers
+ * An array with multipliers as keys and image style mappings as values.
*
- * @ingroup themeable
+ * @return \Drupal\Core\Template\Attribute[]
+ * An array of attributes for the source tag.
*/
-function theme_responsive_image_source($variables) {
- $output = array();
- if (isset($variables['media']) && !empty($variables['media'])) {
- if (!isset($variables['srcset'])) {
- $output[] = '<!-- <source media="' . $variables['media'] . '" src="' . $variables['src'] . '" ' . new Attribute($variables['dimensions']) . ' /> -->';
- $output[] = '<source media="' . $variables['media'] . '" src="' . $variables['src'] . '" ' . new Attribute($variables['dimensions']) . '/>';
- }
- elseif (!isset($variables['src'])) {
- $output[] = '<!-- <source media="' . $variables['media'] . '" srcset="' . $variables['srcset'] . '" ' . new Attribute($variables['dimensions']) . ' /> -->';
- $output[] = '<source media="' . $variables['media'] . '" srcset="' . $variables['srcset'] . '" ' . new Attribute($variables['dimensions']) . ' />';
+function responsive_image_build_source_attributes(ImageInterface $image, array $variables, BreakpointInterface $breakpoint, array $multipliers) {
+ $width = isset($variables['width']) && !empty($variables['width']) ? $variables['width'] : $image->getWidth();
+ $height = isset($variables['height']) && !empty($variables['height']) ? $variables['height'] : $image->getHeight();
+ $extension = pathinfo($image->getSource(), PATHINFO_EXTENSION);
+ $sizes = array();
+ $srcset = array();
+ $derivative_mime_types = array();
+ foreach ($multipliers as $multiplier => $image_style_mapping) {
+ switch ($image_style_mapping['image_mapping_type']) {
+ // Create a <source> tag with the 'sizes' attribute.
+ case 'sizes':
+ // Loop through the image styles for this breakpoint and multiplier.
+ foreach ($image_style_mapping['image_mapping']['sizes_image_styles'] as $image_style_name) {
+ // Get the dimensions.
+ $dimensions = responsive_image_get_image_dimensions($image_style_name, array('width' => $width, 'height' => $height));
+ // Get MIME type.
+ $derivative_mime_type = responsive_image_get_mime_type($image_style_name, $extension);
+ $derivative_mime_types[] = $derivative_mime_type;
+
+ // Add the image source with its width descriptor. When a width
+ // descriptor is used in a srcset, we can't add a multiplier to
+ // it. Because of this, the image styles for all multipliers of
+ // this breakpoint should be merged into one srcset and the sizes
+ // attribute should be merged as well.
+ if (is_null($dimensions['width'])) {
+ throw new \LogicException(String::format('Could not determine image width for @file using image style with ID: @image_style_name. This image style can not be used for a responsive image style mapping using the \'sizes\' attribute.', array('@file' => $image->getSource(), '@image_style_name' => $image_style_name)));
+ }
+ // Use the image width as key so we can sort the array later on.
+ // Images within a srcset should be sorted from small to large, since
+ // the first matching source will be used.
+ $srcset[intval($dimensions['width'])] = file_create_url(_responsive_image_image_style_url($image_style_name, $image->getSource())) . ' ' . $dimensions['width'] . 'w';
+ $sizes = array_merge(explode(',', $image_style_mapping['image_mapping']['sizes']), $sizes);
+ }
+ break;
+
+ case 'image_style':
+ // Get MIME type.
+ $derivative_mime_type = responsive_image_get_mime_type($image_style_mapping['image_mapping'], $extension);
+ $derivative_mime_types[] = $derivative_mime_type;
+ // Add the image source with its multiplier. Use the multiplier as key
+ // so we can sort the array later on. Multipliers within a srcset should
+ // be sorted from small to large, since the first matching source will
+ // be used. We multiply it by 100 so multipliers with up to two decimals
+ // can be used.
+ $srcset[intval(Unicode::substr($multiplier, 0, -1) * 100)] = file_create_url(_responsive_image_image_style_url($image_style_mapping['image_mapping'], $image->getSource())) . ' ' . $multiplier;
+ break;
}
}
- else {
- $output[] = '<!-- <source src="' . $variables['src'] . '" ' . new Attribute($variables['dimensions']) . ' /> -->';
- $output[] = '<source src="' . $variables['src'] . '" ' . new Attribute($variables['dimensions']) . '/>';
+ // Sort the srcset from small to large image width or multiplier.
+ ksort($srcset);
+ $source_attributes = new \Drupal\Core\Template\Attribute(array(
+ 'srcset' => implode(', ', array_unique($srcset)),
+ 'media' => $breakpoint->getMediaQuery(),
+ ));
+ if (count(array_unique($derivative_mime_types)) == 1) {
+ $source_attributes->setAttribute('type', $derivative_mime_types[0]);
}
- return implode("\n", $output);
+ if (!empty($sizes)) {
+ $source_attributes->setAttribute('sizes', implode(',', array_unique($sizes)));
+ }
+ return $source_attributes;
}
/**
* Determines the dimensions of an image.
*
- * @param $variables
+ * @param string $image_style_name
+ * The name of the style to be used to alter the original image.
+ * @param array $dimensions
* An associative array containing:
- * - style_name: The name of the style to be used to alter the original image.
* - width: The width of the source image (if known).
* - height: The height of the source image (if known).
*
@@ -304,21 +426,16 @@ function theme_responsive_image_source($variables) {
* Dimensions to be modified - an array with components width and height, in
* pixels.
*/
-function responsive_image_get_image_dimensions($variables) {
+function responsive_image_get_image_dimensions($image_style_name, array $dimensions) {
// Determine the dimensions of the styled image.
- $dimensions = array(
- 'width' => $variables['width'],
- 'height' => $variables['height'],
- );
-
- if ($variables['style_name'] == RESPONSIVE_IMAGE_EMPTY_IMAGE) {
+ if ($image_style_name == RESPONSIVE_IMAGE_EMPTY_IMAGE) {
$dimensions = array(
'width' => 1,
'height' => 1,
);
}
else {
- $entity = entity_load('image_style', $variables['style_name']);
+ $entity = ImageStyle::load($image_style_name);
if ($entity instanceof Drupal\image\Entity\ImageStyle) {
$entity->transformDimensions($dimensions);
}
@@ -328,17 +445,38 @@ function responsive_image_get_image_dimensions($variables) {
}
/**
+ * Determines the MIME type of an image.
+ *
+ * @param string $image_style_name
+ * The image style that will be applied to the image.
+ * @param string $extension
+ * The original extension of the image (without the leading dot).
+ *
+ * @return string
+ * The MIME type of the image after the image style is applied.
+ */
+function responsive_image_get_mime_type($image_style_name, $extension) {
+ if ($image_style_name == RESPONSIVE_IMAGE_EMPTY_IMAGE) {
+ return 'image/gif';
+ }
+ // The MIME type guesser needs a full path, not just an extension, but the
+ // file doesn't have to exist.
+ $fake_path = 'responsive_image.' . ImageStyle::load($image_style_name)->getDerivativeExtension($extension);
+ return Drupal::service('file.mime_type.guesser.extension')->guess($fake_path);
+}
+
+/**
* Wrapper around image_style_url() so we can return an empty image.
*/
function _responsive_image_image_style_url($style_name, $path) {
if ($style_name == RESPONSIVE_IMAGE_EMPTY_IMAGE) {
// The smallest data URI for a 1px square transparent GIF image.
- return 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
+ // http://probablyprogramming.com/2009/03/15/the-tiniest-gif-ever
+ return 'data:image/gif;base64,R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==';
}
- $entity = entity_load('image_style', $style_name);
+ $entity = ImageStyle::load($style_name);
if ($entity instanceof Drupal\image\Entity\ImageStyle) {
return $entity->buildUrl($path);
}
return file_create_url($path);
}
-
diff --git a/core/modules/responsive_image/responsive_image.routing.yml b/core/modules/responsive_image/responsive_image.routing.yml
index 2cf9926..6a00ff6 100644
--- a/core/modules/responsive_image/responsive_image.routing.yml
+++ b/core/modules/responsive_image/responsive_image.routing.yml
@@ -1,39 +1,39 @@
-entity.responsive_image_mapping.collection:
- path: '/admin/config/media/responsive-image-mapping'
+entity.responsive_image_style.collection:
+ path: '/admin/config/media/responsive-image-style'
defaults:
- _entity_list: 'responsive_image_mapping'
- _title: 'Responsive image mappings'
+ _entity_list: 'responsive_image_style'
+ _title: 'Responsive image styles'
requirements:
_permission: 'administer responsive images'
-responsive_image.mapping_page_add:
- path: '/admin/config/media/responsive-image-mapping/add'
+responsive_image.style_page_add:
+ path: '/admin/config/media/responsive-image-style/add'
defaults:
- _entity_form: 'responsive_image_mapping.add'
- _title: 'Add responsive image mapping'
+ _entity_form: 'responsive_image_style.add'
+ _title: 'Add responsive image style'
requirements:
_permission: 'administer responsive images'
-entity.responsive_image_mapping.edit_form:
- path: '/admin/config/media/responsive-image-mapping/{responsive_image_mapping}'
+entity.responsive_image_style.edit_form:
+ path: '/admin/config/media/responsive-image-style/{responsive_image_style}'
defaults:
- _entity_form: 'responsive_image_mapping.edit'
- _title: 'Edit responsive image mapping'
+ _entity_form: 'responsive_image_style.edit'
+ _title: 'Edit responsive image style'
requirements:
_permission: 'administer responsive images'
-entity.responsive_image_mapping.duplicate_form:
- path: '/admin/config/media/responsive-image-mapping/{responsive_image_mapping}/duplicate'
+entity.responsive_image_style.duplicate_form:
+ path: '/admin/config/media/responsive-image-style/{responsive_image_style}/duplicate'
defaults:
- _entity_form: 'responsive_image_mapping.duplicate'
- _title: 'Duplicate responsive image mapping'
+ _entity_form: 'responsive_image_style.duplicate'
+ _title: 'Duplicate responsive image style'
requirements:
_permission: 'administer responsive images'
-responsive_image.mapping_action_confirm:
- path: '/admin/config/media/responsive-image-mapping/{responsive_image_mapping}/delete'
+entity.responsive_image_style.delete_form:
+ path: '/admin/config/media/responsive-image-style/{responsive_image_style}/delete'
defaults:
- _entity_form: 'responsive_image_mapping.delete'
+ _entity_form: 'responsive_image_style.delete'
_title: 'Delete'
requirements:
_permission: 'administer responsive images'
diff --git a/core/modules/responsive_image/src/Entity/ResponsiveImageMapping.php b/core/modules/responsive_image/src/Entity/ResponsiveImageMapping.php
deleted file mode 100644
index 62215d8..0000000
--- a/core/modules/responsive_image/src/Entity/ResponsiveImageMapping.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\responsive_image\Entity\ResponsiveImageMapping.
- */
-
-namespace Drupal\responsive_image\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\responsive_image\ResponsiveImageMappingInterface;
-
-/**
- * Defines the responsive image mapping entity.
- *
- * @ConfigEntityType(
- * id = "responsive_image_mapping",
- * label = @Translation("Responsive image mapping"),
- * handlers = {
- * "list_builder" = "Drupal\responsive_image\ResponsiveImageMappingListBuilder",
- * "form" = {
- * "edit" = "Drupal\responsive_image\ResponsiveImageMappingForm",
- * "add" = "Drupal\responsive_image\ResponsiveImageMappingForm",
- * "delete" = "Drupal\Core\Entity\EntityDeleteForm",
- * "duplicate" = "Drupal\responsive_image\ResponsiveImageMappingForm"
- * }
- * },
- * list_path = "admin/config/media/responsive-image-mapping",
- * admin_permission = "administer responsive images",
- * config_prefix = "mappings",
- * entity_keys = {
- * "id" = "id",
- * "label" = "label"
- * },
- * links = {
- * "edit-form" = "/admin/config/media/responsive-image-mapping/{responsive_image_mapping}",
- * "duplicate-form" = "/admin/config/media/responsive-image-mapping/{responsive_image_mapping}/duplicate",
- * "collection" = "/admin/config/media/responsive-image-mapping",
- * }
- * )
- */
-class ResponsiveImageMapping extends ConfigEntityBase implements ResponsiveImageMappingInterface {
-
- /**
- * The responsive image ID (machine name).
- *
- * @var string
- */
- protected $id;
-
- /**
- * The responsive image label.
- *
- * @var string
- */
- protected $label;
-
- /**
- * The responsive image mappings.
- *
- * Each responsive mapping array contains the following keys:
- * - breakpoint_id
- * - multiplier
- * - image_style
- *
- * @var array
- */
- protected $mappings = array();
-
- /**
- * @var array
- */
- protected $keyedMappings;
-
- /**
- * The responsive image breakpoint group.
- *
- * @var string
- */
- protected $breakpointGroup = '';
-
- /**
- * {@inheritdoc}
- */
- public function __construct(array $values, $entity_type_id = 'responsive_image_mapping') {
- parent::__construct($values, $entity_type_id);
- }
-
- /**
- * {@inheritdoc}
- */
- public function addMapping($breakpoint_id, $multiplier, $image_style) {
- foreach ($this->mappings as &$mapping) {
- if ($mapping['breakpoint_id'] === $breakpoint_id && $mapping['multiplier'] === $multiplier) {
- $mapping['image_style'] = $image_style;
- return $this;
- }
- }
- $this->mappings[] = array(
- 'breakpoint_id' => $breakpoint_id,
- 'multiplier' => $multiplier,
- 'image_style' => $image_style,
- );
- $this->keyedMappings = NULL;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function hasMappings() {
- return !empty($this->mappings);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getKeyedMappings() {
- if (!$this->keyedMappings) {
- $this->keyedMappings = array();
- foreach($this->mappings as $mapping) {
- $this->keyedMappings[$mapping['breakpoint_id']][$mapping['multiplier']] = $mapping['image_style'];
- }
- }
- return $this->keyedMappings;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getImageStyle($breakpoint_id, $multiplier) {
- $map = $this->getKeyedMappings();
- if (isset($map[$breakpoint_id][$multiplier])) {
- return $map[$breakpoint_id][$multiplier];
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function getMappings() {
- return $this->get('mappings');
- }
-
- /**
- * {@inheritdoc}
- */
- public function setBreakpointGroup($breakpoint_group) {
- // If the breakpoint group is changed then the mappings are invalid.
- if ($breakpoint_group !== $this->breakpointGroup) {
- $this->removeMappings();
- }
- $this->set('breakpointGroup', $breakpoint_group);
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function getBreakpointGroup() {
- return $this->get('breakpointGroup');
- }
-
- /**
- * {@inheritdoc}
- */
- public function removeMappings() {
- $this->mappings = array();
- $this->keyedMappings = NULL;
- return $this;
- }
-
- /**
- * {@inheritdoc}
- */
- public function calculateDependencies() {
- parent::calculateDependencies();
- $providers = \Drupal::service('breakpoint.manager')->getGroupProviders($this->breakpointGroup);
- foreach ($providers as $provider => $type) {
- $this->addDependency($type, $provider);
- }
- return $this->dependencies;
- }
-
-}
diff --git a/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php b/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
new file mode 100644
index 0000000..aee5a70
--- /dev/null
+++ b/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
@@ -0,0 +1,224 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\responsive_image\Entity\ResponsiveImageStyle.
+ */
+
+namespace Drupal\responsive_image\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityBase;
+use Drupal\responsive_image\ResponsiveImageStyleInterface;
+
+/**
+ * Defines the responsive image style entity.
+ *
+ * @ConfigEntityType(
+ * id = "responsive_image_style",
+ * label = @Translation("Responsive image style"),
+ * handlers = {
+ * "list_builder" = "Drupal\responsive_image\ResponsiveImageStyleListBuilder",
+ * "form" = {
+ * "edit" = "Drupal\responsive_image\ResponsiveImageStyleForm",
+ * "add" = "Drupal\responsive_image\ResponsiveImageStyleForm",
+ * "delete" = "Drupal\Core\Entity\EntityDeleteForm",
+ * "duplicate" = "Drupal\responsive_image\ResponsiveImageStyleForm"
+ * }
+ * },
+ * list_path = "admin/config/media/responsive-image-style",
+ * admin_permission = "administer responsive images",
+ * config_prefix = "styles",
+ * entity_keys = {
+ * "id" = "id",
+ * "label" = "label"
+ * },
+ * links = {
+ * "edit-form" = "/admin/config/media/responsive-image-style/{responsive_image_style}",
+ * "duplicate-form" = "/admin/config/media/responsive-image-style/{responsive_image_style}/duplicate",
+ * "delete-form" = "/admin/config/media/responsive-image-style/{responsive_image_style}/delete",
+ * "collection" = "/admin/config/media/responsive-image-style",
+ * }
+ * )
+ */
+class ResponsiveImageStyle extends ConfigEntityBase implements ResponsiveImageStyleInterface {
+
+ /**
+ * The responsive image ID (machine name).
+ *
+ * @var string
+ */
+ protected $id;
+
+ /**
+ * The responsive image label.
+ *
+ * @var string
+ */
+ protected $label;
+
+ /**
+ * The image style mappings.
+ *
+ * Each image style mapping array contains the following keys:
+ * - image_mapping_type: Either 'image_style' or 'sizes'.
+ * - image_mapping:
+ * - If image_mapping_type is 'image_style', the image style ID (a
+ * string).
+ * - If image_mapping_type is 'sizes', an array with following keys:
+ * - sizes: The value for the 'sizes' attribute.
+ * - sizes_image_styles: The image styles to use for the 'srcset'
+ * attribute.
+ * - breakpoint_id: The breakpoint ID for this image style mapping.
+ * - multiplier: The multiplier for this image style mapping.
+ *
+ * @var array
+ */
+ protected $image_style_mappings = array();
+
+ /**
+ * @var array
+ */
+ protected $keyedImageStyleMappings;
+
+ /**
+ * The responsive image breakpoint group.
+ *
+ * @var string
+ */
+ protected $breakpoint_group = '';
+
+ /**
+ * {@inheritdoc}
+ */
+ public function __construct(array $values, $entity_type_id = 'responsive_image_style') {
+ parent::__construct($values, $entity_type_id);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function addImageStyleMapping($breakpoint_id, $multiplier, array $image_style_mapping) {
+ // If there is an existing mapping, overwrite it.
+ foreach ($this->image_style_mappings as &$mapping) {
+ if ($mapping['breakpoint_id'] === $breakpoint_id && $mapping['multiplier'] === $multiplier) {
+ $mapping = array(
+ 'breakpoint_id' => $breakpoint_id,
+ 'multiplier' => $multiplier,
+ ) + $image_style_mapping;
+ return $this;
+ }
+ }
+ $this->image_style_mappings[] = array(
+ 'breakpoint_id' => $breakpoint_id,
+ 'multiplier' => $multiplier,
+ ) + $image_style_mapping;
+ $this->keyedImageStyleMappings = NULL;
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function hasImageStyleMappings() {
+ $mappings = $this->getKeyedImageStyleMappings();
+ return !empty($mappings);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getKeyedImageStyleMappings() {
+ if (!$this->keyedImageStyleMappings) {
+ $this->keyedImageStyleMappings = array();
+ foreach($this->image_style_mappings as $mapping) {
+ if (!static::isEmptyImageStyleMapping($mapping)) {
+ $this->keyedImageStyleMappings[$mapping['breakpoint_id']][$mapping['multiplier']] = $mapping;
+ }
+ }
+ }
+ return $this->keyedImageStyleMappings;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getImageStyleMappings() {
+ return $this->image_style_mappings;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setBreakpointGroup($breakpoint_group) {
+ // If the breakpoint group is changed then the image style mappings are
+ // invalid.
+ if ($breakpoint_group !== $this->breakpoint_group) {
+ $this->removeImageStyleMappings();
+ }
+ $this->breakpoint_group = $breakpoint_group;
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getBreakpointGroup() {
+ return $this->breakpoint_group;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function removeImageStyleMappings() {
+ $this->image_style_mappings = array();
+ $this->keyedImageStyleMappings = NULL;
+ return $this;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function calculateDependencies() {
+ parent::calculateDependencies();
+ $providers = \Drupal::service('breakpoint.manager')->getGroupProviders($this->breakpoint_group);
+ foreach ($providers as $provider => $type) {
+ $this->addDependency($type, $provider);
+ }
+ return $this->dependencies;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function isEmptyImageStyleMapping(array $image_style_mapping) {
+ if (!empty($image_style_mapping)) {
+ switch ($image_style_mapping['image_mapping_type']) {
+ case 'sizes':
+ // The image style mapping must have a sizes attribute defined and one
+ // or more image styles selected.
+ if ($image_style_mapping['image_mapping']['sizes'] && $image_style_mapping['image_mapping']['sizes_image_styles']) {
+ return FALSE;
+ }
+ break;
+ case 'image_style':
+ // The image style mapping must have an image style selected.
+ if ($image_style_mapping['image_mapping']) {
+ return FALSE;
+ }
+ break;
+ }
+ }
+ return TRUE;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getImageStyleMapping($breakpoint_id, $multiplier) {
+ $map = $this->getKeyedImageStyleMappings();
+ if (isset($map[$breakpoint_id][$multiplier])) {
+ return $map[$breakpoint_id][$multiplier];
+ }
+ }
+
+}
diff --git a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
index ed6bcf0..0cf8d8a 100644
--- a/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
+++ b/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
@@ -16,6 +16,8 @@ use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Url;
use Drupal\image\Plugin\Field\FieldFormatter\ImageFormatterBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\responsive_image\Entity\ResponsiveImageStyle;
+use Drupal\image\Entity\ImageStyle;
/**
* Plugin for responsive image formatter.
@@ -33,7 +35,7 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
/**
* @var EntityStorageInterface
*/
- protected $responsiveImageMappingStorage;
+ protected $responsiveImageStyleStorage;
/**
* Constructs a ResponsiveImageFormatter object.
@@ -52,13 +54,13 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
* The view mode.
* @param array $third_party_settings
* Any third party settings.
- * @param \Drupal\Core\Entity\EntityStorageInterface $responsive_image_mapping_storage
- * The responsive image mapping storage.
+ * @param \Drupal\Core\Entity\EntityStorageInterface $responsive_image_style_storage
+ * The responsive image style storage.
*/
- public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, EntityStorageInterface $responsive_image_mapping_storage) {
+ public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, EntityStorageInterface $responsive_image_style_storage) {
parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
- $this->responsiveImageMappingStorage = $responsive_image_mapping_storage;
+ $this->responsiveImageStyleStorage = $responsive_image_style_storage;
}
/**
@@ -73,7 +75,7 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
$configuration['label'],
$configuration['view_mode'],
$configuration['third_party_settings'],
- $container->get('entity.manager')->getStorage('responsive_image_mapping')
+ $container->get('entity.manager')->getStorage('responsive_image_style')
);
}
@@ -82,7 +84,7 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
*/
public static function defaultSettings() {
return array(
- 'responsive_image_mapping' => '',
+ 'responsive_image_style' => '',
'fallback_image_style' => '',
'image_link' => '',
) + parent::defaultSettings();
@@ -93,19 +95,19 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
*/
public function settingsForm(array $form, FormStateInterface $form_state) {
$responsive_image_options = array();
- $responsive_image_mappings = $this->responsiveImageMappingStorage->loadMultiple();
- if ($responsive_image_mappings && !empty($responsive_image_mappings)) {
- foreach ($responsive_image_mappings as $machine_name => $responsive_image_mapping) {
- if ($responsive_image_mapping->hasMappings()) {
- $responsive_image_options[$machine_name] = $responsive_image_mapping->label();
+ $responsive_image_styles = $this->responsiveImageStyleStorage->loadMultiple();
+ if ($responsive_image_styles && !empty($responsive_image_styles)) {
+ foreach ($responsive_image_styles as $machine_name => $responsive_image_style) {
+ if ($responsive_image_style->hasImageStyleMappings()) {
+ $responsive_image_options[$machine_name] = $responsive_image_style->label();
}
}
}
- $elements['responsive_image_mapping'] = array(
- '#title' => t('Responsive image mapping'),
+ $elements['responsive_image_style'] = array(
+ '#title' => t('Responsive image style'),
'#type' => 'select',
- '#default_value' => $this->getSetting('responsive_image_mapping'),
+ '#default_value' => $this->getSetting('responsive_image_style'),
'#required' => TRUE,
'#options' => $responsive_image_options,
);
@@ -140,9 +142,9 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
public function settingsSummary() {
$summary = array();
- $responsive_image_mapping = $this->responsiveImageMappingStorage->load($this->getSetting('responsive_image_mapping'));
- if ($responsive_image_mapping) {
- $summary[] = t('Responsive image mapping: @responsive_image_mapping', array('@responsive_image_mapping' => $responsive_image_mapping->label()));
+ $responsive_image_style = $this->responsiveImageStyleStorage->load($this->getSetting('responsive_image_style'));
+ if ($responsive_image_style) {
+ $summary[] = t('Responsive image style: @responsive_image_style', array('@responsive_image_style' => $responsive_image_style->label()));
$image_styles = image_style_options(FALSE);
unset($image_styles['']);
@@ -163,7 +165,7 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
}
}
else {
- $summary[] = t('Select a responsive image mapping.');
+ $summary[] = t('Select a responsive image style.');
}
return $summary;
@@ -191,28 +193,47 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
}
// Collect cache tags to be added for each item in the field.
- $responsive_image_mapping = $this->responsiveImageMappingStorage->load($this->getSetting('responsive_image_mapping'));
+ $responsive_image_style = $this->responsiveImageStyleStorage->load($this->getSetting('responsive_image_style'));
$image_styles_to_load = array();
- if ($fallback_image_style) {
- $image_styles_to_load[] = $fallback_image_style;
- }
$cache_tags = [];
- if ($responsive_image_mapping) {
- $cache_tags = Cache::mergeTags($cache_tags, $responsive_image_mapping->getCacheTags());
- foreach ($responsive_image_mapping->getMappings() as $mapping) {
- // First mapping found is used as fallback.
- if (empty($fallback_image_style)) {
- $fallback_image_style = $mapping['image_style'];
+ if ($responsive_image_style) {
+ $cache_tags = Cache::mergeTags($cache_tags, $responsive_image_style->getCacheTags());
+ foreach ($responsive_image_style->getImageStyleMappings() as $image_style_mapping) {
+ // Only image styles of non-empty mappings should be loaded.
+ if (!$responsive_image_style::isEmptyImageStyleMapping($image_style_mapping)) {
+
+ if ($image_style_mapping['image_mapping_type'] == 'image_style') {
+ // This mapping has one image style, add it.
+ $image_styles_to_load[] = $image_style_mapping['image_mapping'];
+ }
+ else {
+ // This mapping has multiple image styles, merge them.
+ $image_style_mapping['image_mapping']['sizes_image_styles'] = array_filter($image_style_mapping['image_mapping']['sizes_image_styles']);
+ $image_styles_to_load = array_merge($image_styles_to_load, $image_style_mapping['image_mapping']['sizes_image_styles']);
+ }
}
- $image_styles_to_load[] = $mapping['image_style'];
}
}
- $image_styles = entity_load_multiple('image_style', $image_styles_to_load);
+
+ // If there is a fallback image style, add it to the image styles to load.
+ if ($fallback_image_style) {
+ $image_styles_to_load[] = $fallback_image_style;
+ }
+ else {
+ // The <picture> element uses the first matching breakpoint (see
+ // http://www.w3.org/html/wg/drafts/html/master/embedded-content.html#update-the-source-set
+ // points 2 and 3). Meaning the breakpoints are sorted from large to
+ // small. With mobile-first in mind, the fallback image should be the one
+ // selected for the smallest screen.
+ $fallback_image_style = end($image_styles_to_load);
+ }
+ $image_styles = ImageStyle::loadMultiple($image_styles_to_load);
foreach ($image_styles as $image_style) {
$cache_tags = Cache::mergeTags($cache_tags, $image_style->getCacheTags());
}
foreach ($items as $delta => $item) {
+ // Link the <picture> element to the original file.
if (isset($link_file)) {
$url = Url::fromUri(file_create_url($item->entity->getFileUri()));
}
@@ -221,15 +242,15 @@ class ResponsiveImageFormatter extends ImageFormatterBase implements ContainerFa
'#attached' => array(
'library' => array(
'core/picturefill',
- )
+ ),
),
'#item' => $item,
'#image_style' => $fallback_image_style,
- '#mapping_id' => $responsive_image_mapping ? $responsive_image_mapping->id() : '',
+ '#responsive_image_style_id' => $responsive_image_style ? $responsive_image_style->id() : '',
'#url' => $url,
'#cache' => array(
'tags' => $cache_tags,
- )
+ ),
);
}
diff --git a/core/modules/responsive_image/src/ResponsiveImageMappingInterface.php b/core/modules/responsive_image/src/ResponsiveImageMappingInterface.php
deleted file mode 100644
index fd9b28b..0000000
--- a/core/modules/responsive_image/src/ResponsiveImageMappingInterface.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\responsive_image\ResponsiveImageMappingInterface.
- */
-
-namespace Drupal\responsive_image;
-
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-
-/**
- * Provides an interface defining a responsive_image mapping entity.
- */
-interface ResponsiveImageMappingInterface extends ConfigEntityInterface {
-
- /**
- * Checks if there is at least one mapping defined.
- *
- * return bool
- * Whether the entity has any responsive image mappings.
- */
- public function hasMappings();
-
- /**
- * Returns the mappings of breakpoint ID and multiplier to image style.
- *
- * @return array[]
- * The responsive image mappings. Keyed by breakpoint ID then multiplier.
- * The value is the image style ID.
- */
- public function getKeyedMappings();
-
- /**
- * Returns the mappings for the responsive image mapping.
- *
- * @return array[]
- * An array responsive image mappings. Each responsive mapping array
- * contains the following keys:
- * - breakpoint_id
- * - multiplier
- * - image_style
- */
- public function getMappings();
-
- /**
- * Sets the breakpoint group for the responsive_image mapping.
- *
- * @param string $breakpoint_group
- * The responsive image mapping breakpoint group.
- *
- * @return $this
- */
- public function setBreakpointGroup($breakpoint_group);
-
- /**
- * Returns the breakpoint group for the responsive image mapping.
- *
- * @return string
- * The breakpoint group.
- */
- public function getBreakpointGroup();
-
- /**
- * Gets the image style ID for a breakpoint ID and multiplier.
- *
- * @param string $breakpoint_id
- * The breakpoint ID.
- * @param string $multiplier
- * The multiplier.
- *
- * @return string|null
- * The image style ID. Null if the mapping does not exist.
- */
- public function getImageStyle($breakpoint_id, $multiplier);
-
- /**
- * Adds a mapping to the responsive image configuration entity.
- *
- * @param string $breakpoint_id
- * The breakpoint ID.
- * @param string $multiplier
- * The multiplier.
- * @param string $image_style
- * The image style ID.
- *
- * @return $this
- */
- public function addMapping($breakpoint_id, $multiplier, $image_style);
-
- /**
- * Removes all mappings from the responsive image configuration entity.
- *
- * @return $this
- */
- public function removeMappings();
-
-}
diff --git a/core/modules/responsive_image/src/ResponsiveImageMappingForm.php b/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
index 1f47865..365f7a5 100644
--- a/core/modules/responsive_image/src/ResponsiveImageMappingForm.php
+++ b/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains Drupal\responsive_image\ResponsiveImageForm.
+ * Contains Drupal\responsive_image\ResponsiveImageStyleForm.
*/
namespace Drupal\responsive_image;
@@ -15,7 +15,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* Form controller for the responsive image edit/add forms.
*/
-class ResponsiveImageMappingForm extends EntityForm {
+class ResponsiveImageStyleForm extends EntityForm {
/**
* The breakpoint manager.
@@ -34,7 +34,7 @@ class ResponsiveImageMappingForm extends EntityForm {
}
/**
- * Constructs the responsive image mapping form.
+ * Constructs the responsive image style form.
*
* @param \Drupal\breakpoint\BreakpointManagerInterface $breakpoint_manager
* The breakpoint manager.
@@ -56,43 +56,43 @@ class ResponsiveImageMappingForm extends EntityForm {
*/
public function form(array $form, FormStateInterface $form_state) {
if ($this->operation == 'duplicate') {
- $form['#title'] = $this->t('<em>Duplicate responsive image mapping</em> @label', array('@label' => $this->entity->label()));
+ $form['#title'] = $this->t('<em>Duplicate responsive image style</em> @label', array('@label' => $this->entity->label()));
$this->entity = $this->entity->createDuplicate();
}
if ($this->operation == 'edit') {
- $form['#title'] = $this->t('<em>Edit responsive image mapping</em> @label', array('@label' => $this->entity->label()));
+ $form['#title'] = $this->t('<em>Edit responsive image style</em> @label', array('@label' => $this->entity->label()));
}
- /** @var \Drupal\responsive_image\ResponsiveImageMappingInterface $responsive_image_mapping */
- $responsive_image_mapping = $this->entity;
+ /** @var \Drupal\responsive_image\ResponsiveImageStyleInterface $responsive_image_style */
+ $responsive_image_style = $this->entity;
$form['label'] = array(
'#type' => 'textfield',
'#title' => $this->t('Label'),
'#maxlength' => 255,
- '#default_value' => $responsive_image_mapping->label(),
+ '#default_value' => $responsive_image_style->label(),
'#description' => $this->t("Example: 'Hero image' or 'Author image'."),
'#required' => TRUE,
);
$form['id'] = array(
'#type' => 'machine_name',
- '#default_value' => $responsive_image_mapping->id(),
+ '#default_value' => $responsive_image_style->id(),
'#machine_name' => array(
- 'exists' => '\Drupal\responsive_image\Entity\ResponsiveImageMapping::load',
+ 'exists' => '\Drupal\responsive_image\Entity\ResponsiveImageStyle::load',
'source' => array('label'),
),
- '#disabled' => (bool) $responsive_image_mapping->id() && $this->operation != 'duplicate',
+ '#disabled' => (bool) $responsive_image_style->id() && $this->operation != 'duplicate',
);
- if ((bool) $responsive_image_mapping->id() && $this->operation != 'duplicate') {
- $description = $this->t('Select a breakpoint group from the installed themes.') . ' ' . $this->t("Warning: if you change the breakpoint group you lose all your selected mappings.");
+ if ((bool) $responsive_image_style->id() && $this->operation != 'duplicate') {
+ $description = $this->t('Select a breakpoint group from the installed themes.') . ' ' . $this->t("Warning: if you change the breakpoint group you lose all your selected image style mappings.");
}
else {
$description = $this->t('Select a breakpoint group from the installed themes.');
}
- $form['breakpointGroup'] = array(
+ $form['breakpoint_group'] = array(
'#type' => 'select',
'#title' => $this->t('Breakpoint group'),
- '#default_value' => $responsive_image_mapping->getBreakpointGroup(),
+ '#default_value' => $responsive_image_style->getBreakpointGroup(),
'#options' => $this->breakpointManager->getGroups(),
'#required' => TRUE,
'#description' => $description,
@@ -100,15 +100,26 @@ class ResponsiveImageMappingForm extends EntityForm {
$image_styles = image_style_options(TRUE);
$image_styles[RESPONSIVE_IMAGE_EMPTY_IMAGE] = $this->t('- empty image -');
- $breakpoints = $this->breakpointManager->getBreakpointsByGroup($responsive_image_mapping->getBreakpointGroup());
+ $breakpoints = $this->breakpointManager->getBreakpointsByGroup($responsive_image_style->getBreakpointGroup());
foreach ($breakpoints as $breakpoint_id => $breakpoint) {
foreach ($breakpoint->getMultipliers() as $multiplier) {
$label = $multiplier . ' ' . $breakpoint->getLabel() . ' [' . $breakpoint->getMediaQuery() . ']';
- $form['keyed_mappings'][$breakpoint_id][$multiplier] = array(
+ $form['keyed_styles'][$breakpoint_id][$multiplier] = array(
+ '#type' => 'container',
+ );
+ $image_style_mapping = $responsive_image_style->getImageStyleMapping($breakpoint_id, $multiplier);
+ // @todo The image_mapping_type is only temporarily hardcoded, until
+ // support for the other responsive image mapping type ('sizes') is
+ // added in https://www.drupal.org/node/2334387.
+ $form['keyed_styles'][$breakpoint_id][$multiplier]['image_mapping_type'] = array(
+ '#type' => 'value',
+ '#value' => 'image_style',
+ );
+ $form['keyed_styles'][$breakpoint_id][$multiplier]['image_mapping'] = array(
'#type' => 'select',
'#title' => $label,
'#options' => $image_styles,
- '#default_value' => $responsive_image_mapping->getImageStyle($breakpoint_id, $multiplier),
+ '#default_value' => isset($image_style_mapping['image_mapping']) ? $image_style_mapping['image_mapping'] : array(),
'#description' => $this->t('Select an image style for this breakpoint.'),
);
}
@@ -116,7 +127,7 @@ class ResponsiveImageMappingForm extends EntityForm {
$form['#tree'] = TRUE;
- return parent::form($form, $form_state, $responsive_image_mapping);
+ return parent::form($form, $form_state, $responsive_image_style);
}
/**
@@ -124,12 +135,15 @@ class ResponsiveImageMappingForm extends EntityForm {
*/
public function validate(array $form, FormStateInterface $form_state) {
// Only validate on edit.
- if ($form_state->hasValue('keyed_mappings')) {
+ if ($form_state->hasValue('keyed_styles')) {
// Check if another breakpoint group is selected.
- if ($form_state->getValue('breakpointGroup') != $form_state->getCompleteForm()['breakpointGroup']['#default_value']) {
- // Remove the mappings since the breakpoint ID has changed.
- $form_state->unsetValue('keyed_mappings');
+ if ($form_state->getValue('breakpoint_group') != $form_state->getCompleteForm()['breakpoint_group']['#default_value']) {
+ // Remove the image style mappings since the breakpoint ID has changed.
+ $form_state->unsetValue('keyed_styles');
}
+ // @todo Filter 'sizes_image_styles' to a normal array in
+ // https://www.drupal.org/node/2334387. For an example see
+ // \Drupal\Core\Block\BlockBase::validateConfigurationForm().
}
}
@@ -137,28 +151,28 @@ class ResponsiveImageMappingForm extends EntityForm {
* {@inheritdoc}
*/
public function save(array $form, FormStateInterface $form_state) {
- /** @var \Drupal\responsive_image\ResponsiveImageMappingInterface $responsive_image_mapping */
- $responsive_image_mapping = $this->entity;
+ /** @var \Drupal\responsive_image\ResponsiveImageStyleInterface $responsive_image_style */
+ $responsive_image_style = $this->entity;
// Remove all the existing mappings and replace with submitted values.
- $responsive_image_mapping->removeMappings();
- if ($form_state->hasValue('keyed_mappings')) {
- foreach ($form_state->getValue('keyed_mappings') as $breakpoint_id => $multipliers) {
- foreach ($multipliers as $multiplier => $image_style) {
- $responsive_image_mapping->addMapping($breakpoint_id, $multiplier, $image_style);
+ $responsive_image_style->removeImageStyleMappings();
+ if ($form_state->hasValue('keyed_styles')) {
+ foreach ($form_state->getValue('keyed_styles') as $breakpoint_id => $multipliers) {
+ foreach ($multipliers as $multiplier => $image_style_mapping) {
+ $responsive_image_style->addImageStyleMapping($breakpoint_id, $multiplier, $image_style_mapping);
}
}
}
- $responsive_image_mapping->save();
+ $responsive_image_style->save();
- $this->logger('responsive_image')->notice('Responsive image mapping @label saved.', array('@label' => $responsive_image_mapping->label()));
- drupal_set_message($this->t('Responsive image mapping %label saved.', array('%label' => $responsive_image_mapping->label())));
+ $this->logger('responsive_image')->notice('Responsive image style @label saved.', array('@label' => $responsive_image_style->label()));
+ drupal_set_message($this->t('Responsive image style %label saved.', array('%label' => $responsive_image_style->label())));
- // Redirect to edit form after creating a new mapping or after selecting
- // another breakpoint group.
- if (!$responsive_image_mapping->hasMappings()) {
+ // Redirect to edit form after creating a new responsive image style or
+ // after selecting another breakpoint group.
+ if (!$responsive_image_style->hasImageStyleMappings()) {
$form_state->setRedirect(
- 'entity.responsive_image_mapping.edit_form',
- array('responsive_image_mapping' => $responsive_image_mapping->id())
+ 'entity.responsive_image_style.edit_form',
+ array('responsive_image_style' => $responsive_image_style->id())
);
}
else {
diff --git a/core/modules/responsive_image/src/ResponsiveImageStyleInterface.php b/core/modules/responsive_image/src/ResponsiveImageStyleInterface.php
new file mode 100644
index 0000000..feb3639
--- /dev/null
+++ b/core/modules/responsive_image/src/ResponsiveImageStyleInterface.php
@@ -0,0 +1,129 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\responsive_image\ResponsiveImageStyleInterface.
+ */
+
+namespace Drupal\responsive_image;
+
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+
+/**
+ * Provides an interface defining a responsive_image mapping entity.
+ */
+interface ResponsiveImageStyleInterface extends ConfigEntityInterface {
+
+ /**
+ * Checks if there is at least one mapping defined.
+ *
+ * @return bool
+ * Whether the entity has any image style mappings.
+ */
+ public function hasImageStyleMappings();
+
+ /**
+ * Returns the mappings of breakpoint ID and multiplier to image style.
+ *
+ * @return array[]
+ * The image style mappings. Keyed by breakpoint ID then multiplier.
+ * The value is the image style mapping array with following keys:
+ * - image_mapping_type: Either 'image_style' or 'sizes'.
+ * - image_mapping:
+ * - If image_mapping_type is 'image_style', the image style ID.
+ * - If image_mapping_type is 'sizes', an array with following keys:
+ * - sizes: The value for the 'sizes' attribute.
+ * - sizes_image_styles: The image styles to use for the 'srcset'
+ * attribute.
+ * - breakpoint_id: The breakpoint ID for this mapping.
+ * - multiplier: The multiplier for this mapping.
+ */
+ public function getKeyedImageStyleMappings();
+
+ /**
+ * Returns the image style mappings for the responsive image style.
+ *
+ * @return array[]
+ * An array of image style mappings. Each image style mapping array
+ * contains the following keys:
+ * - breakpoint_id
+ * - multiplier
+ * - image_mapping_type
+ * - image_mapping
+ */
+ public function getImageStyleMappings();
+
+ /**
+ * Sets the breakpoint group for the responsive image style.
+ *
+ * @param string $breakpoint_group
+ * The responsive image style breakpoint group.
+ *
+ * @return $this
+ */
+ public function setBreakpointGroup($breakpoint_group);
+
+ /**
+ * Returns the breakpoint group for the responsive image style.
+ *
+ * @return string
+ * The breakpoint group.
+ */
+ public function getBreakpointGroup();
+
+ /**
+ * Gets the image style mapping for a breakpoint ID and multiplier.
+ *
+ * @param string $breakpoint_id
+ * The breakpoint ID.
+ * @param string $multiplier
+ * The multiplier.
+ *
+ * @return array|null
+ * The image style mapping. NULL if the mapping does not exist.
+ * The image style mapping has following keys:
+ * - image_mapping_type: Either 'image_style' or 'sizes'.
+ * - image_mapping:
+ * - If image_mapping_type is 'image_style', the image style ID.
+ * - If image_mapping_type is 'sizes', an array with following keys:
+ * - sizes: The value for the 'sizes' attribute.
+ * - sizes_image_styles: The image styles to use for the 'srcset'
+ * attribute.
+ * - breakpoint_id: The breakpoint ID for this image style mapping.
+ * - multiplier: The multiplier for this image style mapping.
+ */
+ public function getImageStyleMapping($breakpoint_id, $multiplier);
+
+ /**
+ * Checks if there is at least one image style mapping defined.
+ *
+ * @param array $image_style_mapping
+ * The image style mapping.
+ *
+ * @return bool
+ * Whether the image style mapping is empty.
+ */
+ public static function isEmptyImageStyleMapping(array $image_style_mapping);
+
+ /**
+ * Adds a image style mapping to the responsive image configuration entity.
+ *
+ * @param string $breakpoint_id
+ * The breakpoint ID.
+ * @param string $multiplier
+ * The multiplier.
+ * @param array $image_style_mapping
+ * The mapping image style mapping.
+ *
+ * @return $this
+ */
+ public function addImageStyleMapping($breakpoint_id, $multiplier, array $image_style_mapping);
+
+ /**
+ * Removes all image style mappings from the responsive image style.
+ *
+ * @return $this
+ */
+ public function removeImageStyleMappings();
+
+}
diff --git a/core/modules/responsive_image/src/ResponsiveImageMappingListBuilder.php b/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
index 6032b7c..744edc3 100644
--- a/core/modules/responsive_image/src/ResponsiveImageMappingListBuilder.php
+++ b/core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains Drupal\responsive_image\ResponsiveImageMappingListBuilder.
+ * Contains Drupal\responsive_image\ResponsiveImageStyleListBuilder.
*/
namespace Drupal\responsive_image;
@@ -11,9 +11,9 @@ use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
use Drupal\Core\Entity\EntityInterface;
/**
- * Provides a listing of responsive image mappings.
+ * Provides a listing of responsive image styles.
*/
-class ResponsiveImageMappingListBuilder extends ConfigEntityListBuilder {
+class ResponsiveImageStyleListBuilder extends ConfigEntityListBuilder {
/**
* {@inheritdoc}
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
index 5935ee0..044a85c 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageAdminUITest.php
@@ -38,64 +38,76 @@ class ResponsiveImageAdminUITest extends WebTestBase {
* Test responsive image administration functionality.
*/
public function testResponsiveImageAdmin() {
- // We start without any default mappings.
- $this->drupalGet('admin/config/media/responsive-image-mapping');
- $this->assertText('There is no Responsive image mapping yet.');
+ // We start without any default styles.
+ $this->drupalGet('admin/config/media/responsive-image-style');
+ $this->assertText('There is no Responsive image style yet.');
- // Add a new responsive image mapping, our breakpoint set should be selected.
- $this->drupalGet('admin/config/media/responsive-image-mapping/add');
- $this->assertFieldByName('breakpointGroup', 'responsive_image_test_module');
+ // Add a new responsive image style, our breakpoint set should be selected.
+ $this->drupalGet('admin/config/media/responsive-image-style/add');
+ $this->assertFieldByName('breakpoint_group', 'responsive_image_test_module');
// Create a new group.
$edit = array(
- 'label' => 'Mapping One',
- 'id' => 'mapping_one',
- 'breakpointGroup' => 'responsive_image_test_module',
+ 'label' => 'Style One',
+ 'id' => 'style_one',
+ 'breakpoint_group' => 'responsive_image_test_module',
);
- $this->drupalPostForm('admin/config/media/responsive-image-mapping/add', $edit, t('Save'));
+ $this->drupalPostForm('admin/config/media/responsive-image-style/add', $edit, t('Save'));
// Check if the new group is created.
$this->assertResponse(200);
- $this->drupalGet('admin/config/media/responsive-image-mapping');
- $this->assertNoText('There is no Responsive image mapping yet.');
- $this->assertText('Mapping One');
- $this->assertText('mapping_one');
+ $this->drupalGet('admin/config/media/responsive-image-style');
+ $this->assertNoText('There is no Responsive image style yet.');
+ $this->assertText('Style One');
+ $this->assertText('style_one');
// Edit the group.
- $this->drupalGet('admin/config/media/responsive-image-mapping/mapping_one');
- $this->assertFieldByName('label', 'Mapping One');
- $this->assertFieldByName('breakpointGroup', 'responsive_image_test_module');
-
- // Check if the dropdowns are present for the mappings.
- $this->assertFieldByName('keyed_mappings[responsive_image_test_module.mobile][1x]', '');
- $this->assertFieldByName('keyed_mappings[responsive_image_test_module.mobile][2x]', '');
- $this->assertFieldByName('keyed_mappings[responsive_image_test_module.narrow][1x]', '');
- $this->assertFieldByName('keyed_mappings[responsive_image_test_module.narrow][2x]', '');
- $this->assertFieldByName('keyed_mappings[responsive_image_test_module.wide][1x]', '');
- $this->assertFieldByName('keyed_mappings[responsive_image_test_module.wide][2x]', '');
-
- // Save mappings for 1x variant only.
+ $this->drupalGet('admin/config/media/responsive-image-style/style_one');
+ $this->assertFieldByName('label', 'Style One');
+ $this->assertFieldByName('breakpoint_group', 'responsive_image_test_module');
+
+ $cases = array(
+ array('mobile', '1x'),
+ array('mobile', '2x'),
+ array('narrow', '1x'),
+ array('narrow', '2x'),
+ array('wide', '1x'),
+ array('wide', '2x'),
+ );
+
+ foreach ($cases as $case) {
+ // Check if the radio buttons are present.
+ $this->assertFieldByName('keyed_styles[responsive_image_test_module.' . $case[0] . '][' . $case[1] . '][image_mapping]', '');
+ }
+
+ // Save styles for 1x variant only.
$edit = array(
- 'label' => 'Mapping One',
- 'breakpointGroup' => 'responsive_image_test_module',
- 'keyed_mappings[responsive_image_test_module.mobile][1x]' => 'thumbnail',
- 'keyed_mappings[responsive_image_test_module.narrow][1x]' => 'medium',
- 'keyed_mappings[responsive_image_test_module.wide][1x]' => 'large',
+ 'label' => 'Style One',
+ 'breakpoint_group' => 'responsive_image_test_module',
+ 'keyed_styles[responsive_image_test_module.mobile][1x][image_mapping]' => 'thumbnail',
+ 'keyed_styles[responsive_image_test_module.narrow][1x][image_mapping]' => 'medium',
+ 'keyed_styles[responsive_image_test_module.wide][1x][image_mapping]' => 'large',
);
- $this->drupalPostForm('admin/config/media/responsive-image-mapping/mapping_one', $edit, t('Save'));
- $this->drupalGet('admin/config/media/responsive-image-mapping/mapping_one');
- $this->assertFieldByName('keyed_mappings[responsive_image_test_module.mobile][1x]', 'thumbnail');
- $this->assertFieldByName('keyed_mappings[responsive_image_test_module.mobile][2x]', '');
- $this->assertFieldByName('keyed_mappings[responsive_image_test_module.narrow][1x]', 'medium');
- $this->assertFieldByName('keyed_mappings[responsive_image_test_module.narrow][2x]', '');
- $this->assertFieldByName('keyed_mappings[responsive_image_test_module.wide][1x]', 'large');
- $this->assertFieldByName('keyed_mappings[responsive_image_test_module.wide][2x]', '');
-
- // Delete the mapping.
- $this->drupalGet('admin/config/media/responsive-image-mapping/mapping_one/delete');
+ $this->drupalPostForm('admin/config/media/responsive-image-style/style_one', $edit, t('Save'));
+ $this->drupalGet('admin/config/media/responsive-image-style/style_one');
+
+ // Check the style for multipliers 1x and 2x for the mobile breakpoint.
+ $this->assertFieldByName('keyed_styles[responsive_image_test_module.mobile][1x][image_mapping]', 'thumbnail');
+ $this->assertFieldByName('keyed_styles[responsive_image_test_module.mobile][2x][image_mapping]', '');
+
+ // Check the style for multipliers 1x and 2x for the narrow breakpoint.
+ $this->assertFieldByName('keyed_styles[responsive_image_test_module.narrow][1x][image_mapping]', 'medium');
+ $this->assertFieldByName('keyed_styles[responsive_image_test_module.narrow][2x][image_mapping]', '');
+
+ // Check the style for multipliers 1x and 2x for the wide breakpoint.
+ $this->assertFieldByName('keyed_styles[responsive_image_test_module.wide][1x][image_mapping]', 'large');
+ $this->assertFieldByName('keyed_styles[responsive_image_test_module.wide][2x][image_mapping]', '');
+
+ // Delete the style.
+ $this->drupalGet('admin/config/media/responsive-image-style/style_one/delete');
$this->drupalPostForm(NULL, array(), t('Delete'));
- $this->drupalGet('admin/config/media/responsive-image-mapping');
- $this->assertText('There is no Responsive image mapping yet.');
+ $this->drupalGet('admin/config/media/responsive-image-style');
+ $this->assertText('There is no Responsive image style yet.');
}
}
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
index b09a9e5..45a418d 100644
--- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php
@@ -9,6 +9,9 @@ namespace Drupal\responsive_image\Tests;
use Drupal\Component\Utility\Unicode;
use Drupal\image\Tests\ImageFieldTestBase;
+use Drupal\image\Entity\ImageStyle;
+use Drupal\node\Entity\Node;
+use Drupal\file\Entity\File;
/**
* Tests responsive image display formatter.
@@ -20,11 +23,11 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
protected $dumpHeaders = TRUE;
/**
- * Responsive image mapping entity instance we test with.
+ * Responsive image style entity instance we test with.
*
- * @var \Drupal\responsive_image\Entity\ResponsiveImageMapping
+ * @var \Drupal\responsive_image\Entity\ResponsiveImageStyle
*/
- protected $responsiveImgMapping;
+ protected $responsiveImgStyle;
/**
* Modules to enable.
@@ -54,27 +57,27 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
'administer image styles'
));
$this->drupalLogin($this->adminUser);
- // Add responsive image mapping.
- $this->responsiveImgMapping = entity_create('responsive_image_mapping', array(
- 'id' => 'mapping_one',
- 'label' => 'Mapping One',
- 'breakpointGroup' => 'responsive_image_test_module',
+ // Add responsive image style.
+ $this->responsiveImgStyle = entity_create('responsive_image_style', array(
+ 'id' => 'style_one',
+ 'label' => 'Style One',
+ 'breakpoint_group' => 'responsive_image_test_module',
));
}
/**
- * Test responsive image formatters on node display for public files.
+ * Tests responsive image formatters on node display for public files.
*/
public function testResponsiveImageFieldFormattersPublic() {
- $this->addTestMappings();
+ $this->addTestImageStyleMappings();
$this->doTestResponsiveImageFieldFormatters('public');
}
/**
- * Test responsive image formatters on node display for private files.
+ * Tests responsive image formatters on node display for private files.
*/
public function testResponsiveImageFieldFormattersPrivate() {
- $this->addTestMappings();
+ $this->addTestImageStyleMappings();
// Remove access content permission from anonymous users.
user_role_change_permissions(DRUPAL_ANONYMOUS_RID, array('access content' => FALSE));
$this->doTestResponsiveImageFieldFormatters('private');
@@ -84,29 +87,64 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
* Test responsive image formatters when image style is empty.
*/
public function testResponsiveImageFieldFormattersEmptyStyle() {
- $this->addTestMappings(TRUE);
+ $this->addTestImageStyleMappings(TRUE);
$this->doTestResponsiveImageFieldFormatters('public', TRUE);
}
/**
- * Add mappings to the responsive image mapping entity.
+ * Add image style mappings to the responsive image style entity.
*
* @param bool $empty_styles
- * If true, the mappings will get empty image styles.
+ * If true, the image style mappings will get empty image styles.
*/
- protected function addTestMappings($empty_styles = FALSE) {
+ protected function addTestImageStyleMappings($empty_styles = FALSE) {
if ($empty_styles) {
- $this->responsiveImgMapping
- ->addMapping('responsive_image_test_module.mobile', '1x', '')
- ->addMapping('responsive_image_test_module.narrow', '1x', '')
- ->addMapping('responsive_image_test_module.wide', '1x', '')
+ $this->responsiveImgStyle
+ ->addImageStyleMapping('responsive_image_test_module.mobile', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => '',
+ ))
+ ->addImageStyleMapping('responsive_image_test_module.narrow', '1x', array(
+ 'image_mapping_type' => 'sizes',
+ 'image_mapping' => array(
+ 'sizes' => '(min-width: 700px) 700px, 100vw',
+ 'sizes_image_styles' => array(),
+ ),
+ ))
+ ->addImageStyleMapping('responsive_image_test_module.wide', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => '',
+ ))
->save();
}
else {
- $this->responsiveImgMapping
- ->addMapping('responsive_image_test_module.mobile', '1x', 'thumbnail')
- ->addMapping('responsive_image_test_module.narrow', '1x', 'medium')
- ->addMapping('responsive_image_test_module.wide', '1x', 'large')
+ $this->responsiveImgStyle
+ // Test the output of an empty image.
+ ->addImageStyleMapping('responsive_image_test_module.mobile', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => RESPONSIVE_IMAGE_EMPTY_IMAGE,
+ ))
+ // Test the output with a 1.5x multiplier.
+ ->addImageStyleMapping('responsive_image_test_module.mobile', '1.5x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'thumbnail',
+ ))
+ // Test the output of the 'sizes' attribute.
+ ->addImageStyleMapping('responsive_image_test_module.narrow', '1x', array(
+ 'image_mapping_type' => 'sizes',
+ 'image_mapping' => array(
+ 'sizes' => '(min-width: 700px) 700px, 100vw',
+ 'sizes_image_styles' => array(
+ 'large',
+ 'medium',
+ ),
+ ),
+ ))
+ // Test the normal output of mapping to an image style.
+ ->addImageStyleMapping('responsive_image_test_module.wide', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'large',
+ ))
->save();
}
}
@@ -126,19 +164,20 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
$node_storage = $this->container->get('entity.manager')->getStorage('node');
$field_name = Unicode::strtolower($this->randomMachineName());
$this->createImageField($field_name, 'article', array('uri_scheme' => $scheme));
- // Create a new node with an image attached.
- $test_image = current($this->drupalGetTestFiles('image'));
+ // Create a new node with an image attached. Make sure we use a large image
+ // so the scale effects of the image styles always have an effect.
+ $test_image = current($this->drupalGetTestFiles('image', 39325));
$nid = $this->uploadNodeImage($test_image, $field_name, 'article');
$node_storage->resetCache(array($nid));
$node = $node_storage->load($nid);
// Test that the default formatter is being used.
- $image_uri = file_load($node->{$field_name}->target_id)->getFileUri();
+ $image_uri = File::load($node->{$field_name}->target_id)->getFileUri();
$image = array(
'#theme' => 'image',
'#uri' => $image_uri,
- '#width' => 40,
- '#height' => 20,
+ '#width' => 360,
+ '#height' => 240,
);
$default_output = str_replace("\n", NULL, drupal_render($image));
$this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.');
@@ -157,8 +196,8 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
$image = array(
'#theme' => 'image',
'#uri' => $image_uri,
- '#width' => 40,
- '#height' => 20,
+ '#width' => 360,
+ '#height' => 240,
);
$default_output = '<a href="' . file_create_url($image_uri) . '">' . drupal_render($image) . '</a>';
$this->drupalGet('node/' . $nid);
@@ -183,50 +222,136 @@ class ResponsiveImageFieldDisplayTest extends ImageFieldTestBase {
$this->drupalLogin($this->adminUser);
}
- // Use the responsive image formatter with a responsive image mapping.
- $display_options['settings']['responsive_image_mapping'] = 'mapping_one';
+ // Use the responsive image formatter with a responsive image style.
+ $display_options['settings']['responsive_image_style'] = 'style_one';
$display_options['settings']['image_link'] = '';
// Also set the fallback image style.
$display_options['settings']['fallback_image_style'] = 'large';
$display->setComponent($field_name, $display_options)
->save();
+ // Create a derivative so at least one MIME type will be known.
+ $large_style = ImageStyle::load('large');
+ $large_style->createDerivative($image_uri, $large_style->buildUri($image_uri));
+
// Output should contain all image styles and all breakpoints.
$this->drupalGet('node/' . $nid);
if (!$empty_styles) {
- $this->assertRaw('/styles/thumbnail/');
$this->assertRaw('/styles/medium/');
+ // Make sure the IE9 workaround is present.
+ $this->assertRaw('<!--[if IE 9]><video style="display: none;"><![endif]-->');
+ $this->assertRaw('<!--[if IE 9]></video><![endif]-->');
+ // Assert the empty image is present.
+ $this->assertRaw('data:image/gif;base64,R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==');
+ $thumbnail_style = ImageStyle::load('thumbnail');
+ // Assert the output of the 'srcset' attribute (small multipliers first).
+ $this->assertRaw('data:image/gif;base64,R0lGODlhAQABAIABAP///wAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw== 1x, ' . $thumbnail_style->buildUrl($image_uri) . ' 1.5x');
+ $this->assertRaw('/styles/medium/');
+ // Assert the output of the breakpoints.
+ $this->assertRaw('media="(min-width: 0px)"');
+ $this->assertRaw('media="(min-width: 560px)"');
+ // Assert the output of the 'sizes' attribute.
+ $this->assertRaw('sizes="(min-width: 700px) 700px, 100vw"');
+ $this->assertPattern('/media="\(min-width: 560px\)".+?sizes="\(min-width: 700px\) 700px, 100vw"/');
+ // Assert the output of the 'srcset' attribute (small images first).
+ $medium_style = ImageStyle::load('medium');
+ $this->assertRaw($medium_style->buildUrl($image_uri) . ' 220w, ' . $large_style->buildUrl($image_uri) . ' 360w');
+ $this->assertRaw('media="(min-width: 851px)"');
}
$this->assertRaw('/styles/large/');
- $this->assertRaw('media="(min-width: 0px)"');
- $this->assertRaw('media="(min-width: 560px)"');
- $this->assertRaw('media="(min-width: 851px)"');
$cache_tags = explode(' ', $this->drupalGetHeader('X-Drupal-Cache-Tags'));
- $this->assertTrue(in_array('config:responsive_image.mappings.mapping_one', $cache_tags));
+ $this->assertTrue(in_array('config:responsive_image.styles.style_one', $cache_tags));
if (!$empty_styles) {
- $this->assertTrue(in_array('config:image.style.thumbnail', $cache_tags));
$this->assertTrue(in_array('config:image.style.medium', $cache_tags));
+ $this->assertTrue(in_array('config:image.style.thumbnail', $cache_tags));
+ $this->assertRaw('type="image/png"');
}
$this->assertTrue(in_array('config:image.style.large', $cache_tags));
// Test the fallback image style.
- $large_style = entity_load('image_style', 'large');
+ $image = \Drupal::service('image.factory')->get($image_uri);
$fallback_image = array(
- '#theme' => 'responsive_image_source',
- '#src' => $large_style->buildUrl($image_uri),
- '#dimensions' => array('width' => 40, 'height' => 20),
+ '#theme' => 'image',
+ '#srcset' => array(
+ array(
+ 'uri' => $large_style->buildUrl($image->getSource()),
+ ),
+ ),
);
$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 large formatter displaying correctly on full node view.');
if ($scheme == 'private') {
// Log out and try to access the file.
$this->drupalLogout();
$this->drupalGet($large_style->buildUrl($image_uri));
- $this->assertResponse('403', 'Access denied to image style thumbnail as anonymous user.');
+ $this->assertResponse('403', 'Access denied to image style large as anonymous user.');
$cache_tags_header = $this->drupalGetHeader('X-Drupal-Cache-Tags');
$this->assertTrue(!preg_match('/ image_style\:/', $cache_tags_header), 'No image style cache tag found.');
}
}
+ /**
+ * Tests responsive image formatters on node display linked to the file.
+ */
+ public function testResponsiveImageFieldFormattersLinkToFile() {
+ $this->addTestImageStyleMappings();
+ $this->assertResponsiveImageFieldFormattersLink('file');
+ }
+
+ /**
+ * Tests responsive image formatters on node display linked to the node.
+ */
+ public function testResponsiveImageFieldFormattersLinkToNode() {
+ $this->addTestImageStyleMappings();
+ $this->assertResponsiveImageFieldFormattersLink('content');
+ }
+
+ /**
+ * Tests responsive image formatters linked to the file or node.
+ *
+ * @param string $link_type
+ * The link type to test. Either 'file' or 'content'.
+ */
+ private function assertResponsiveImageFieldFormattersLink($link_type) {
+ $field_name = Unicode::strtolower($this->randomMachineName());
+ $this->createImageField($field_name, 'article', array('uri_scheme' => 'public'));
+ // Create a new node with an image attached.
+ $test_image = current($this->drupalGetTestFiles('image'));
+ $nid = $this->uploadNodeImage($test_image, $field_name, 'article');
+ $this->container->get('entity.manager')->getStorage('node')->resetCache(array($nid));
+ $node = Node::load($nid);
+
+ // Use the responsive image formatter linked to file formatter.
+ $display_options = array(
+ 'type' => 'responsive_image',
+ 'settings' => array(
+ 'image_link' => $link_type,
+ 'responsive_image_style' => 'style_one',
+ 'fallback_image_style' => 'large',
+ ),
+ );
+ entity_get_display('node', 'article', 'default')
+ ->setComponent($field_name, $display_options)
+ ->save();
+
+ // Create a derivative so at least one MIME type will be known.
+ $large_style = ImageStyle::load('large');
+ $image_uri = File::load($node->{$field_name}->target_id)->getFileUri();
+ $large_style->createDerivative($image_uri, $large_style->buildUri($image_uri));
+
+ // Output should contain all image styles and all breakpoints.
+ $this->drupalGet('node/' . $nid);
+ switch ($link_type) {
+ case 'file':
+ // Make sure the link to the file is present.
+ $this->assertPattern('/<a(.*?)href="' . preg_quote(file_create_url($image_uri), '/') . '"(.*?)><picture/');
+ break;
+
+ case 'content':
+ // Make sure the link to the node is present.
+ $this->assertPattern('/<a(.*?)href="' . preg_quote($node->url(), '/') . '"(.*?)><picture/');
+ break;
+ }
+ }
}
diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
new file mode 100644
index 0000000..fa088f6
--- /dev/null
+++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldUiTest.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\responsive_image\Tests\ResponsiveImageFieldUiTest.
+ */
+
+namespace Drupal\responsive_image\Tests;
+
+
+use Drupal\field_ui\Tests\FieldUiTestTrait;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the "Responsive Image" formatter settings form.
+ *
+ * @group responsive_image
+ */
+class ResponsiveImageFieldUiTest extends WebTestBase {
+
+ use FieldUiTestTrait;
+
+ /**
+ * Modules to install.
+ *
+ * @var array
+ */
+ public static $modules = array('node', 'field_ui', 'image', 'responsive_image', 'responsive_image_test_module', 'block');
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ $this->drupalPlaceBlock('system_breadcrumb_block');
+ // Create a test user.
+ $admin_user = $this->drupalCreateUser(array('access content', 'administer content types', 'administer node fields', 'administer node form display', 'administer node display', 'bypass node access'));
+ $this->drupalLogin($admin_user);
+
+ // Create content type, with underscores.
+ $type_name = strtolower($this->randomMachineName(8)) . '_test';
+ $type = $this->drupalCreateContentType(array('name' => $type_name, 'type' => $type_name));
+ $this->type = $type->id();
+ }
+
+ /**
+ * Tests formatter settings.
+ */
+ function testResponsiveImageFormatterUI() {
+ $manage_fields = 'admin/structure/types/manage/' . $this->type;
+ $manage_display = $manage_fields . '/display';
+
+ // Create a field, and a node with some data for the field.
+ $this->fieldUIAddNewField($manage_fields, 'image', 'Image field', 'image');
+ // Display the "Manage display".
+ $this->drupalGet($manage_display);
+
+ // Change the formatter and check that the summary is updated.
+ $edit = array('fields[field_image][type]' => 'responsive_image', 'refresh_rows' => 'field_image');
+ $this->drupalPostAjaxForm(NULL, $edit, array('op' => t('Refresh')));
+ $this->assertText("Select a responsive image style.", 'The expected summary is displayed.');
+
+ // Submit the form.
+ $this->drupalPostForm(NULL, array(), t('Save'));
+ $this->assertText("Select a responsive image style.", 'The expected summary is displayed.');
+
+ // Create responsive image styles.
+ $responsive_image_style = entity_create('responsive_image_style', array(
+ 'id' => 'style_one',
+ 'label' => 'Style One',
+ 'breakpoint_group' => 'responsive_image_test_module',
+ ));
+ $responsive_image_style
+ ->addImageStyleMapping('responsive_image_test_module.mobile', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'thumbnail',
+ ))
+ ->addImageStyleMapping('responsive_image_test_module.narrow', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'medium'
+ ))
+ // Test the normal output of mapping to an image style.
+ ->addImageStyleMapping('responsive_image_test_module.wide', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'large',
+ ))
+ ->save();
+ \Drupal::entityManager()->clearCachedFieldDefinitions();
+ // Refresh the page.
+ $this->drupalGet($manage_display);
+ $this->assertText("Select a responsive image style.", 'The expected summary is displayed.');
+
+ // Click on the formatter settings button to open the formatter settings
+ // form.
+ $this->drupalPostAjaxForm(NULL, array(), "field_image_settings_edit");
+
+ // Assert that the correct fields are present.
+ $fieldnames = array(
+ 'fields[field_image][settings_edit_form][settings][responsive_image_style]',
+ 'fields[field_image][settings_edit_form][settings][fallback_image_style]',
+ 'fields[field_image][settings_edit_form][settings][image_link]',
+ );
+ foreach ($fieldnames as $fieldname) {
+ $this->assertField($fieldname);
+ }
+ $edit = array(
+ 'fields[field_image][settings_edit_form][settings][responsive_image_style]' => 'style_one',
+ 'fields[field_image][settings_edit_form][settings][fallback_image_style]' => 'thumbnail',
+ 'fields[field_image][settings_edit_form][settings][image_link]' => 'content',
+ );
+ $this->drupalPostAjaxForm(NULL, $edit, "field_image_plugin_settings_update");
+
+ // Save the form to save the settings.
+ $this->drupalPostForm(NULL, array(), t('Save'));
+ $this->assertText('Responsive image style: Style One');
+ $this->assertText('Fallback Image style: Thumbnail (100×100)');
+ $this->assertText('Linked to content');
+
+ // Click on the formatter settings button to open the formatter settings
+ // form.
+ $this->drupalPostAjaxForm(NULL, array(), "field_image_settings_edit");
+ $edit = array(
+ 'fields[field_image][settings_edit_form][settings][responsive_image_style]' => 'style_one',
+ 'fields[field_image][settings_edit_form][settings][fallback_image_style]' => '',
+ 'fields[field_image][settings_edit_form][settings][image_link]' => 'file',
+ );
+ $this->drupalPostAjaxForm(NULL, $edit, "field_image_plugin_settings_update");
+
+ // Save the form to save the third party settings.
+ $this->drupalPostForm(NULL, array(), t('Save'));
+ $this->assertText('Responsive image style: Style One');
+ $this->assertText('Automatic fallback');
+ $this->assertText('Linked to file');
+ }
+
+}
diff --git a/core/modules/responsive_image/templates/responsive-image.html.twig b/core/modules/responsive_image/templates/responsive-image.html.twig
new file mode 100644
index 0000000..9a89043
--- /dev/null
+++ b/core/modules/responsive_image/templates/responsive-image.html.twig
@@ -0,0 +1,30 @@
+{#
+/**
+ * @file
+ * Default theme implementation of a responsive image.
+ *
+ * Available variables:
+ * - sources: The attributes of the <source> tags for this <picture> tag.
+ * - fallback_image: The fallback <img> tag to use for this <picture> tag.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_responsive_image()
+ *
+ * @ingroup themeable
+ */
+#}
+<picture>
+ {% if sources %}
+ {#
+ Internet Explorer 9 doesn't recognise source elements that are wrapped in
+ picture tags. See http://scottjehl.github.io/picturefill/#ie9
+ #}
+ <!--[if IE 9]><video style="display: none;"><![endif]-->
+ {% for source_attributes in sources %}
+ <source{{ source_attributes }}/>
+ {% endfor %}
+ <!--[if IE 9]></video><![endif]-->
+ {% endif %}
+ {# The controlling image, with the fallback image in srcset. #}
+ {{ img_element }}
+</picture>
diff --git a/core/modules/responsive_image/tests/modules/responsive_image_test_module/responsive_image_test_module.breakpoints.yml b/core/modules/responsive_image/tests/modules/responsive_image_test_module/responsive_image_test_module.breakpoints.yml
index 247ab23..0d32372 100644
--- a/core/modules/responsive_image/tests/modules/responsive_image_test_module/responsive_image_test_module.breakpoints.yml
+++ b/core/modules/responsive_image/tests/modules/responsive_image_test_module/responsive_image_test_module.breakpoints.yml
@@ -4,6 +4,7 @@ responsive_image_test_module.mobile:
weight: 0
multipliers:
- 1x
+ - 1.5x
- 2x
responsive_image_test_module.narrow:
label: narrow
@@ -11,6 +12,7 @@ responsive_image_test_module.narrow:
weight: 1
multipliers:
- 1x
+ - 1.5x
- 2x
responsive_image_test_module.wide:
label: wide
@@ -18,4 +20,5 @@ responsive_image_test_module.wide:
weight: 2
multipliers:
- 1x
+ - 1.5x
- 2x
diff --git a/core/modules/responsive_image/tests/src/Unit/ResponsiveImageMappingConfigEntityUnitTest.php b/core/modules/responsive_image/tests/src/Unit/ResponsiveImageMappingConfigEntityUnitTest.php
deleted file mode 100644
index df8a0ab..0000000
--- a/core/modules/responsive_image/tests/src/Unit/ResponsiveImageMappingConfigEntityUnitTest.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Tests\responsive_image\Unit\ResponsiveImageMappingConfigEntityUnitTest.
- */
-
-namespace Drupal\Tests\responsive_image\Unit;
-
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\responsive_image\Entity\ResponsiveImageMapping;
-use Drupal\Tests\UnitTestCase;
-
-/**
- * @coversDefaultClass \Drupal\responsive_image\Entity\ResponsiveImageMapping
- * @group block
- */
-class ResponsiveImageMappingConfigEntityUnitTest extends UnitTestCase {
-
- /**
- * The entity type used for testing.
- *
- * @var \Drupal\Core\Entity\EntityTypeInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $entityType;
-
- /**
- * The entity manager used for testing.
- *
- * @var \Drupal\Core\Entity\EntityManagerInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $entityManager;
-
- /**
- * The breakpoint manager used for testing.
- *
- * @var \Drupal\breakpoint\BreakpointManagerInterface|\PHPUnit_Framework_MockObject_MockObject
- */
- protected $breakpointManager;
-
- /**
- * {@inheritdoc}
- */
- protected function setUp() {
- $this->entityType = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
- $this->entityType->expects($this->any())
- ->method('getProvider')
- ->will($this->returnValue('responsive_image'));
-
- $this->entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
- $this->entityManager->expects($this->any())
- ->method('getDefinition')
- ->with('responsive_image_mapping')
- ->will($this->returnValue($this->entityType));
-
- $this->breakpointManager = $this->getMock('\Drupal\breakpoint\BreakpointManagerInterface');
-
- $container = new ContainerBuilder();
- $container->set('entity.manager', $this->entityManager);
- $container->set('breakpoint.manager', $this->breakpointManager);
- \Drupal::setContainer($container);
- }
-
- /**
- * @covers ::calculateDependencies
- */
- public function testCalculateDependencies() {
- $entity = new ResponsiveImageMapping(array('breakpointGroup' => 'test_group'));
- $entity->setBreakpointGroup('test_group');
-
- $this->breakpointManager->expects($this->any())
- ->method('getGroupProviders')
- ->with('test_group')
- ->willReturn(array('bartik' => 'theme', 'toolbar' => 'module'));
-
- $dependencies = $entity->calculateDependencies();
- $this->assertContains('toolbar', $dependencies['module']);
- $this->assertContains('bartik', $dependencies['theme']);
- }
-
- /**
- * @covers ::addMapping
- * @covers ::hasMappings
- */
- public function testHasMappings() {
- $entity = new ResponsiveImageMapping(array());
- $this->assertFalse($entity->hasMappings());
- $entity->addMapping('test_breakpoint', '1x', 'test_style');
- $this->assertTrue($entity->hasMappings());
- }
-
- /**
- * @covers ::addMapping
- * @covers ::getImageStyle
- */
- public function testGetImageStyle() {
- $entity = new ResponsiveImageMapping(array(''));
- $entity->addMapping('test_breakpoint', '1x', 'test_style');
- $this->assertEquals('test_style', $entity->getImageStyle('test_breakpoint', '1x'));
- $this->assertNull($entity->getImageStyle('test_unknown_breakpoint', '1x'));
- }
-
- /**
- * @covers ::addMapping
- * @covers ::getMappings
- */
- public function testGetKeyedMappings() {
- $entity = new ResponsiveImageMapping(array(''));
- $entity->addMapping('test_breakpoint', '1x', 'test_style');
- $entity->addMapping('test_breakpoint', '2x', 'test_style2');
- $entity->addMapping('test_breakpoint2', '1x', 'test_style3');
-
- $expected = array(
- 'test_breakpoint' => array(
- '1x' => 'test_style',
- '2x' => 'test_style2',
- ),
- 'test_breakpoint2' => array(
- '1x' => 'test_style3',
- )
- );
- $this->assertEquals($expected, $entity->getKeyedMappings());
-
- // Add another mapping to ensure keyed mapping static cache is rebuilt.
- $entity->addMapping('test_breakpoint2', '2x', 'test_style4');
- $expected['test_breakpoint2']['2x'] = 'test_style4';
- $this->assertEquals($expected, $entity->getKeyedMappings());
- }
-
- /**
- * @covers ::addMapping
- * @covers ::getMappings
- */
- public function testGetMappings() {
- $entity = new ResponsiveImageMapping(array(''));
- $entity->addMapping('test_breakpoint', '1x', 'test_style');
- $entity->addMapping('test_breakpoint', '2x', 'test_style2');
- $entity->addMapping('test_breakpoint2', '1x', 'test_style3');
-
- $expected = array(
- array(
- 'breakpoint_id' => 'test_breakpoint',
- 'multiplier' => '1x',
- 'image_style' => 'test_style',
- ),
- array(
- 'breakpoint_id' => 'test_breakpoint',
- 'multiplier' => '2x',
- 'image_style' => 'test_style2',
- ),
- array(
- 'breakpoint_id' => 'test_breakpoint2',
- 'multiplier' => '1x',
- 'image_style' => 'test_style3',
- ),
- );
- $this->assertEquals($expected, $entity->getMappings());
- }
-
- /**
- * @covers ::addMapping
- * @covers ::removeMappings
- */
- public function testRemoveMappings() {
- $entity = new ResponsiveImageMapping(array(''));
- $entity->addMapping('test_breakpoint', '1x', 'test_style');
- $entity->addMapping('test_breakpoint', '2x', 'test_style2');
- $entity->addMapping('test_breakpoint2', '1x', 'test_style3');
-
- $this->assertTrue($entity->hasMappings());
- $entity->removeMappings();
- $this->assertEmpty($entity->getMappings());
- $this->assertEmpty($entity->getKeyedMappings());
- $this->assertFalse($entity->hasMappings());
- }
-
- /**
- * @covers ::setBreakpointGroup
- * @covers ::getBreakpointGroup
- */
- public function testSetBreakpointGroup() {
- $entity = new ResponsiveImageMapping(array('breakpointGroup' => 'test_group'));
- $entity->addMapping('test_breakpoint', '1x', 'test_style');
- $entity->addMapping('test_breakpoint', '2x', 'test_style2');
- $entity->addMapping('test_breakpoint2', '1x', 'test_style3');
-
- // Ensure that setting to same group does not remove mappings.
- $entity->setBreakpointGroup('test_group');
- $this->assertTrue($entity->hasMappings());
- $this->assertEquals('test_group', $entity->getBreakpointGroup());
-
- // Ensure that changing the group removes mappings.
- $entity->setBreakpointGroup('test_group2');
- $this->assertEquals('test_group2', $entity->getBreakpointGroup());
- $this->assertFalse($entity->hasMappings());
- }
-
-}
diff --git a/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php b/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php
new file mode 100644
index 0000000..afbb26f
--- /dev/null
+++ b/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php
@@ -0,0 +1,339 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Tests\responsive_image\Unit\ResponsiveImageStyleConfigEntityUnitTest.
+ */
+
+namespace Drupal\Tests\responsive_image\Unit;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\responsive_image\Entity\ResponsiveImageStyle;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\responsive_image\Entity\ResponsiveImageStyle
+ * @group block
+ */
+class ResponsiveImageStyleConfigEntityUnitTest extends UnitTestCase {
+
+ /**
+ * The entity type used for testing.
+ *
+ * @var \Drupal\Core\Entity\EntityTypeInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $entityType;
+
+ /**
+ * The entity manager used for testing.
+ *
+ * @var \Drupal\Core\Entity\EntityManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $entityManager;
+
+ /**
+ * The breakpoint manager used for testing.
+ *
+ * @var \Drupal\breakpoint\BreakpointManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+ */
+ protected $breakpointManager;
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ $this->entityType = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
+ $this->entityType->expects($this->any())
+ ->method('getProvider')
+ ->will($this->returnValue('responsive_image'));
+
+ $this->entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
+ $this->entityManager->expects($this->any())
+ ->method('getDefinition')
+ ->with('responsive_image_style')
+ ->will($this->returnValue($this->entityType));
+
+ $this->breakpointManager = $this->getMock('\Drupal\breakpoint\BreakpointManagerInterface');
+
+ $container = new ContainerBuilder();
+ $container->set('entity.manager', $this->entityManager);
+ $container->set('breakpoint.manager', $this->breakpointManager);
+ \Drupal::setContainer($container);
+ }
+
+ /**
+ * @covers ::calculateDependencies
+ */
+ public function testCalculateDependencies() {
+ $entity = new ResponsiveImageStyle(array('breakpoint_group' => 'test_group'));
+ $entity->setBreakpointGroup('test_group');
+
+ $this->breakpointManager->expects($this->any())
+ ->method('getGroupProviders')
+ ->with('test_group')
+ ->willReturn(array('bartik' => 'theme', 'toolbar' => 'module'));
+
+ $dependencies = $entity->calculateDependencies();
+ $this->assertContains('toolbar', $dependencies['module']);
+ $this->assertContains('bartik', $dependencies['theme']);
+ }
+
+ /**
+ * @covers ::addImageStyleMapping
+ * @covers ::hasImageStyleMappings
+ */
+ public function testHasImageStyleMappings() {
+ $entity = new ResponsiveImageStyle(array());
+ $this->assertFalse($entity->hasImageStyleMappings());
+ $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => '',
+ ));
+ $this->assertFalse($entity->hasImageStyleMappings());
+ $entity->removeImageStyleMappings();
+ $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+ 'image_mapping_type' => 'sizes',
+ 'image_mapping' => array(
+ 'sizes' => '(min-width:700px) 700px, 100vw',
+ 'sizes_image_styles' => array(),
+ ),
+ ));
+ $this->assertFalse($entity->hasImageStyleMappings());
+ $entity->removeImageStyleMappings();
+ $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+ 'image_mapping_type' => 'sizes',
+ 'image_mapping' => array(
+ 'sizes' => '',
+ 'sizes_image_styles' => array(
+ 'large' => 'large',
+ ),
+ ),
+ ));
+ $this->assertFalse($entity->hasImageStyleMappings());
+ $entity->removeImageStyleMappings();
+ $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'large',
+ ));
+ $this->assertTrue($entity->hasImageStyleMappings());
+ $entity->removeImageStyleMappings();
+ $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+ 'image_mapping_type' => 'sizes',
+ 'image_mapping' => array(
+ 'sizes' => '(min-width:700px) 700px, 100vw',
+ 'sizes_image_styles' => array(
+ 'large' => 'large',
+ ),
+ ),
+ ));
+ $this->assertTrue($entity->hasImageStyleMappings());
+ }
+
+ /**
+ * @covers ::addImageStyleMapping
+ * @covers ::getImageStyleMapping
+ */
+ public function testGetImageStyleMapping() {
+ $entity = new ResponsiveImageStyle(array(''));
+ $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'large',
+ ));
+ $expected = array(
+ 'breakpoint_id' => 'test_breakpoint',
+ 'multiplier' => '1x',
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'large',
+ );
+ $this->assertEquals($expected, $entity->getImageStyleMapping('test_breakpoint', '1x'));
+ $this->assertNull($entity->getImageStyleMapping('test_unknown_breakpoint', '1x'));
+ }
+
+ /**
+ * @covers ::addImageStyleMapping
+ * @covers ::getKeyedImageStyleMappings
+ */
+ public function testGetKeyedImageStyleMappings() {
+ $entity = new ResponsiveImageStyle(array(''));
+ $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'large',
+ ));
+ $entity->addImageStyleMapping('test_breakpoint', '2x', array(
+ 'image_mapping_type' => 'sizes',
+ 'image_mapping' => array(
+ 'sizes' => '(min-width:700px) 700px, 100vw',
+ 'sizes_image_styles' => array(
+ 'large' => 'large',
+ ),
+ ),
+ ));
+ $entity->addImageStyleMapping('test_breakpoint2', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'thumbnail',
+ ));
+
+ $expected = array(
+ 'test_breakpoint' => array(
+ '1x' => array(
+ 'breakpoint_id' => 'test_breakpoint',
+ 'multiplier' => '1x',
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'large',
+ ),
+ '2x' => array(
+ 'breakpoint_id' => 'test_breakpoint',
+ 'multiplier' => '2x',
+ 'image_mapping_type' => 'sizes',
+ 'image_mapping' => array(
+ 'sizes' => '(min-width:700px) 700px, 100vw',
+ 'sizes_image_styles' => array(
+ 'large' => 'large',
+ ),
+ ),
+ ),
+ ),
+ 'test_breakpoint2' => array(
+ '1x' => array(
+ 'breakpoint_id' => 'test_breakpoint2',
+ 'multiplier' => '1x',
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'thumbnail',
+ ),
+ )
+ );
+ $this->assertEquals($expected, $entity->getKeyedImageStyleMappings());
+
+ // Add another mapping to ensure keyed mapping static cache is rebuilt.
+ $entity->addImageStyleMapping('test_breakpoint2', '2x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'medium',
+ ));
+ $expected['test_breakpoint2']['2x'] = array(
+ 'breakpoint_id' => 'test_breakpoint2',
+ 'multiplier' => '2x',
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'medium',
+ );
+ $this->assertEquals($expected, $entity->getKeyedImageStyleMappings());
+ }
+
+ /**
+ * @covers ::addImageStyleMapping
+ * @covers ::getImageStyleMappings
+ */
+ public function testGetImageStyleMappings() {
+ $entity = new ResponsiveImageStyle(array(''));
+ $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'large',
+ ));
+ $entity->addImageStyleMapping('test_breakpoint', '2x', array(
+ 'image_mapping_type' => 'sizes',
+ 'image_mapping' => array(
+ 'sizes' => '(min-width:700px) 700px, 100vw',
+ 'sizes_image_styles' => array(
+ 'large' => 'large',
+ ),
+ ),
+ ));
+ $entity->addImageStyleMapping('test_breakpoint2', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'thumbnail',
+ ));
+
+ $expected = array(
+ array(
+ 'breakpoint_id' => 'test_breakpoint',
+ 'multiplier' => '1x',
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'large',
+ ),
+ array(
+ 'breakpoint_id' => 'test_breakpoint',
+ 'multiplier' => '2x',
+ 'image_mapping_type' => 'sizes',
+ 'image_mapping' => array(
+ 'sizes' => '(min-width:700px) 700px, 100vw',
+ 'sizes_image_styles' => array(
+ 'large' => 'large',
+ ),
+ ),
+ ),
+ array(
+ 'breakpoint_id' => 'test_breakpoint2',
+ 'multiplier' => '1x',
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'thumbnail',
+ ),
+ );
+ $this->assertEquals($expected, $entity->getImageStyleMappings());
+ }
+
+ /**
+ * @covers ::addImageStyleMapping
+ * @covers ::removeImageStyleMappings
+ */
+ public function testRemoveImageStyleMappings() {
+ $entity = new ResponsiveImageStyle(array(''));
+ $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'large',
+ ));
+ $entity->addImageStyleMapping('test_breakpoint', '2x', array(
+ 'image_mapping_type' => 'sizes',
+ 'image_mapping' => array(
+ 'sizes' => '(min-width:700px) 700px, 100vw',
+ 'sizes_image_styles' => array(
+ 'large' => 'large',
+ ),
+ ),
+ ));
+ $entity->addImageStyleMapping('test_breakpoint2', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'thumbnail',
+ ));
+
+ $this->assertTrue($entity->hasImageStyleMappings());
+ $entity->removeImageStyleMappings();
+ $this->assertEmpty($entity->getImageStyleMappings());
+ $this->assertEmpty($entity->getKeyedImageStyleMappings());
+ $this->assertFalse($entity->hasImageStyleMappings());
+ }
+
+ /**
+ * @covers ::setBreakpointGroup
+ * @covers ::getBreakpointGroup
+ */
+ public function testSetBreakpointGroup() {
+ $entity = new ResponsiveImageStyle(array('breakpoint_group' => 'test_group'));
+ $entity->addImageStyleMapping('test_breakpoint', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'large',
+ ));
+ $entity->addImageStyleMapping('test_breakpoint', '2x', array(
+ 'image_mapping_type' => 'sizes',
+ 'image_mapping' => array(
+ 'sizes' => '(min-width:700px) 700px, 100vw',
+ 'sizes_image_styles' => array(
+ 'large' => 'large',
+ ),
+ ),
+ ));
+ $entity->addImageStyleMapping('test_breakpoint2', '1x', array(
+ 'image_mapping_type' => 'image_style',
+ 'image_mapping' => 'thumbnail',
+ ));
+
+ // Ensure that setting to same group does not remove mappings.
+ $entity->setBreakpointGroup('test_group');
+ $this->assertTrue($entity->hasImageStyleMappings());
+ $this->assertEquals('test_group', $entity->getBreakpointGroup());
+
+ // Ensure that changing the group removes mappings.
+ $entity->setBreakpointGroup('test_group2');
+ $this->assertEquals('test_group2', $entity->getBreakpointGroup());
+ $this->assertFalse($entity->hasImageStyleMappings());
+ }
+
+}
diff --git a/core/modules/toolbar/toolbar.breakpoints.yml b/core/modules/toolbar/toolbar.breakpoints.yml
index a68784a..df9f61b 100644
--- a/core/modules/toolbar/toolbar.breakpoints.yml
+++ b/core/modules/toolbar/toolbar.breakpoints.yml
@@ -1,7 +1,7 @@
toolbar.narrow:
label: narrow
mediaQuery: 'only screen and (min-width: 16.5em)'
- weight: 0
+ weight: 2
multipliers:
- 1x
toolbar.standard:
@@ -13,6 +13,6 @@ toolbar.standard:
toolbar.wide:
label: wide
mediaQuery: 'only screen and (min-width: 61em)'
- weight: 2
+ weight: 0
multipliers:
- 1x
diff --git a/core/themes/bartik/bartik.breakpoints.yml b/core/themes/bartik/bartik.breakpoints.yml
index 17b9fc8..8e420b0 100644
--- a/core/themes/bartik/bartik.breakpoints.yml
+++ b/core/themes/bartik/bartik.breakpoints.yml
@@ -1,7 +1,7 @@
bartik.mobile:
label: mobile
mediaQuery: '(min-width: 0px)'
- weight: 0
+ weight: 2
multipliers:
- 1x
bartik.narrow:
@@ -13,6 +13,6 @@ bartik.narrow:
bartik.wide:
label: wide
mediaQuery: 'all and (min-width: 851px)'
- weight: 2
+ weight: 0
multipliers:
- 1x
diff --git a/core/themes/seven/seven.breakpoints.yml b/core/themes/seven/seven.breakpoints.yml
index 1b6bd2f..9cc1fda 100644
--- a/core/themes/seven/seven.breakpoints.yml
+++ b/core/themes/seven/seven.breakpoints.yml
@@ -1,12 +1,12 @@
seven.mobile:
label: mobile
mediaQuery: '(min-width: 0em)'
- weight: 0
+ weight: 1
multipliers:
- 1x
seven.wide:
label: wide
mediaQuery: 'screen and (min-width: 40em)'
- weight: 1
+ weight: 0
multipliers:
- 1x
diff --git a/core/themes/stark/stark.breakpoints.yml b/core/themes/stark/stark.breakpoints.yml
index d1cdd9b..92d33b2 100644
--- a/core/themes/stark/stark.breakpoints.yml
+++ b/core/themes/stark/stark.breakpoints.yml
@@ -1,7 +1,7 @@
stark.mobile:
label: mobile
mediaQuery: '(min-width: 0px)'
- weight: 0
+ weight: 2
multipliers:
- 1x
stark.narrow:
@@ -13,6 +13,6 @@ stark.narrow:
stark.wide:
label: wide
mediaQuery: 'all and (min-width: 960px)'
- weight: 2
+ weight: 0
multipliers:
- 1x