Merge branch 'dev' of github.com:quasarframework/quasar into dev

Author: rstoenescu

dev/components/components/infinite-scroll.vue

@@ -2,10 +2,11 @@
   <div>
     <div class="layout-padding">
       <p class="caption">Scroll down to see it in action.</p>
+      <q-toggle v-model="active" label="Active" />
 
       <br>
-      <q-infinite-scroll :handler="refresher">
-        <div v-for="(item, index) in items" class="caption">
+      <q-infinite-scroll :handler="refresher" v-if="active">
+        <div v-for="(item, index) in items" :key="index" class="caption">
           <q-chip square color="secondary" class="shadow-1">
             {{ index + 1 }}
           </q-chip>
@@ -16,6 +17,7 @@
           <q-spinner name="dots" slot="message" :size="40"/>
         </div>
       </q-infinite-scroll>
+      <div v-else style="height: 300vh">Placeholder for scroll</div>
     </div>
   </div>
 </template>
@@ -24,7 +26,8 @@
 export default {
   data () {
     return {
-      items: [{}, {}, {}, {}, {}]
+      items: [{}, {}, {}, {}, {}],
+      active: true
     }
   },
   methods: {
@@ -37,6 +40,7 @@ export default {
         }
 
         this.items = this.items.concat(items)
+        console.log('refresh')
         done()
       }, 2500)
     }

src/components/infinite-scroll/QInfiniteScroll.js

@@ -60,8 +60,10 @@ export default {
       this.index = 0
     },
     resume () {
-      this.working = true
-      this.scrollContainer.addEventListener('scroll', this.poll, listenOpts.passive)
+      if (this.working !== true) {
+        this.working = true
+        this.scrollContainer.addEventListener('scroll', this.poll, listenOpts.passive)
+      }
       this.immediatePoll()
     },
     stop () {
@@ -75,13 +77,14 @@ export default {
       this.element = this.$refs.content
 
       this.scrollContainer = this.inline ? this.$el : getScrollTarget(this.$el)
-      if (this.working) {
-        this.scrollContainer.addEventListener('scroll', this.poll, listenOpts.passive)
-      }
 
       this.poll()
       this.immediatePoll = this.poll
       this.poll = debounce(this.poll, 50)
+
+      if (this.working === true) {
+        this.scrollContainer.addEventListener('scroll', this.poll, listenOpts.passive)
+      }
     })
   },
   beforeDestroy () {

src/components/select/QSelect.js

@@ -36,7 +36,11 @@ export default {
     chipsColor: String,
     chipsBgColor: String,
     displayValue: String,
-    popupMaxHeight: String
+    popupMaxHeight: String,
+    popupCover: {
+      type: Boolean,
+      default: true
+    }
   },
   data () {
     return {
@@ -351,7 +355,7 @@ export default {
       staticClass: 'column no-wrap',
       'class': this.dark ? 'bg-dark' : null,
       props: {
-        cover: true,
+        cover: this.popupCover,
         keepOnScreen: true,
         disable: !this.editable,
         anchorClick: false,