Merge branch 'release/1.2.0'

NeilujD · Jan 19, 2017 · e62490c · e62490c
2 parents 5fee2a0 + 4f0457d
commit e62490c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "paper-avatar",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "A simple avatar using the paper-fab style",
   "homepage": "https://neilujd.github.io/paper-avatar",
   "authors": [

diff --git a/demo/index.html b/demo/index.html
@@ -62,5 +62,14 @@ <h3>paper-avatar with specific image sizing</h3>
         </template>
       </demo-snippet>
     </div>
+
+    <div class="vertical-section-container centered">
+      <h3>paper-avatar with label</h3>
+      <demo-snippet>
+        <template>
+          <paper-avatar label="N"></paper-avatar>
+        </template>
+      </demo-snippet>
+    </div>
   </body>
 </html>
diff --git a/paper-avatar.html b/paper-avatar.html
@@ -126,7 +126,7 @@
 
     <iron-icon
       id="icon"
-      hidden$="{{!_computeIsIconFab(icon, iconSrc)}}"
+      hidden$="{{!_computeIsIconFab(icon, iconSrc, label)}}"
       src="[[iconSrc]]"
       icon="[[icon]]"></iron-icon>
     <iron-image
@@ -135,7 +135,7 @@
       preload
       sizing="[[imageSizing]]"
       fade></iron-image>
-    <span hidden$="{{_computeIsIconFab(icon, iconSrc)}}">{{label}}</span>
+    <span hidden$="{{_computeIsIconFab(icon, iconSrc, label)}}">{{label}}</span>
   </template>
 
   <script>
@@ -197,7 +197,7 @@
          */
         label: {
           type: String,
-          observer: '_labelChanged'
+          observer: "_labelChanged"
         },
 
         /**
@@ -212,8 +212,8 @@
         this.setAttribute('aria-label', this.label);
       },
 
-      _computeIsIconFab: function(icon, src) {
-        return (icon.length > 0) || (src.length > 0);
+      _computeIsIconFab: function(icon, src, label) {
+        return !label && ((icon.length > 0) || (src.length > 0));
       }
     });
   </script>