| Index: polymer_1.2.3/bower_components/iron-image/iron-image.html
|
| diff --git a/polymer_1.0.4/bower_components/iron-image/iron-image.html b/polymer_1.2.3/bower_components/iron-image/iron-image.html
|
| similarity index 92%
|
| copy from polymer_1.0.4/bower_components/iron-image/iron-image.html
|
| copy to polymer_1.2.3/bower_components/iron-image/iron-image.html
|
| index 7eba73f9750bc0657b9a5487af12dc4ecca5aaeb..4d2fcd3afb41fc3c106e88b345a1b06fe5d64136 100644
|
| --- a/polymer_1.0.4/bower_components/iron-image/iron-image.html
|
| +++ b/polymer_1.2.3/bower_components/iron-image/iron-image.html
|
| @@ -9,7 +9,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
| -->
|
|
|
| <link rel="import" href="../polymer/polymer.html">
|
| -<link rel="import" href="../iron-flex-layout/classes/iron-flex-layout.html">
|
| +<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
|
|
|
| <!--
|
| `iron-image` is an element for displaying an image that provides useful sizing and
|
| @@ -58,6 +58,11 @@ Examples:
|
| <iron-image style="width:400px; height:400px; background-color: lightgray;"
|
| sizing="cover" preload fade src="http://lorempixel.com/600/400"></iron-image>
|
|
|
| +Custom property | Description | Default
|
| +----------------|-------------|----------
|
| +`--iron-image-placeholder` | Mixin applied to #placeholder | `{}`
|
| +`--iron-image-width` | Sets the width of the wrapped image | `auto`
|
| +`--iron-image-height` | Sets the height of the wrapped image | `auto`
|
|
|
| @group Iron Elements
|
| @element iron-image
|
| @@ -74,6 +79,12 @@ Examples:
|
| position: relative;
|
| }
|
|
|
| + #img {
|
| + display: block;
|
| + width: var(--iron-image-width, auto);
|
| + height: var(--iron-image-height, auto);
|
| + }
|
| +
|
| :host([sizing]) #img {
|
| display: none;
|
| }
|
| @@ -81,6 +92,8 @@ Examples:
|
| #placeholder {
|
| background-color: inherit;
|
| opacity: 1;
|
| + @apply(--layout-fit);
|
| + @apply(--iron-image-placeholder);
|
| }
|
|
|
| #placeholder.faded-out {
|
| @@ -138,7 +151,7 @@ Examples:
|
| },
|
|
|
| /**
|
| - * When a sizing option is uzed (`cover` or `contain`), this determines
|
| + * When a sizing option is used (`cover` or `contain`), this determines
|
| * how the image is aligned within the element bounds.
|
| */
|
| position: {
|
| @@ -148,7 +161,7 @@ Examples:
|
|
|
| /**
|
| * When `true`, any change to the `src` property will cause the `placeholder`
|
| - * image to be shown until the
|
| + * image to be shown until the new image has loaded.
|
| */
|
| preload: {
|
| type: Boolean,
|
| @@ -259,11 +272,11 @@ Examples:
|
| return '';
|
| }
|
|
|
| - var className = 'fit';
|
| if (this.loaded && this.fade) {
|
| - className += ' faded-out';
|
| + return 'faded-out';
|
| }
|
| - return className;
|
| +
|
| + return '';
|
| },
|
|
|
| _computePlaceholderBackgroundUrl: function() {
|
|
|