fix(image-list): Fix type comparison & use image slot in ImageListItem

matsp · Mar 27, 2018 · f0a7a1b · f0a7a1b
1 parent 1d10870
commit f0a7a1b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/components/image-list/ImageList.vue b/components/image-list/ImageList.vue
@@ -25,12 +25,12 @@ export default {
   computed: {
     classes () {
       let standard = {}
-      if (this.standardColumn > 0 && typeof this.masonryColumn === 'null') {
+      if (this.standardColumn > 0 && typeof this.masonryColumn === 'undefined') {
         standard['image-list-standard-' + this.standardColumn] = true
       }
 
       let masonry = {}
-      if (this.masonryColumn > 0 && typeof this.standardColumn === 'null') {
+      if (this.masonryColumn > 0 && typeof this.standardColumn === 'undefined') {
         masonry['image-list-masonry-' + this.masonryColumn] = true
         masonry['mdc-image-list--masonry'] = true
       }

diff --git a/components/image-list/ImageListItem.vue b/components/image-list/ImageListItem.vue
@@ -3,14 +3,11 @@
     <div
       v-if="adjustAspectRatio" 
       class="mdc-image-list__image-aspect-container">
-      <img
-        class="mdc-image-list__image"
-        :src="src">
+      <slot name="image"/>
     </div>
-    <img
+    <slot
       v-else
-      class="mdc-image-list__image"
-      :src="src">
+      name="image"/>
     <div
       v-if="$slots['default']"
       class="mdc-image-list__supporting">
@@ -24,14 +21,17 @@
 <script>
 export default  {
   props: {
-    src: {
-      type: String,
-      required: true
-    },
     adjustAspectRatio: {
       type: Boolean,
       default: true
     }
+  },
+  mounted () {
+    if (this.$slots.image) {
+      this.$slots.image.map(n => {
+        n.elm.classList.add('mdc-image-list__image')
+      })
+    }
   }
 }
 </script>