Merge pull request bootstrap-vue#114 from SirLamer/popover-refactor

GregPeden · web-flow · commit bf3e31b0f859 · 2017-02-22T01:44:45.000-07:00
Popover: Fix 'hide' event detection and convert 'debounce' to property
diff --git a/components/popover.vue b/components/popover.vue
@@ -27,10 +27,6 @@ const triggerListeners = {
     focus: {focus: 'show', blur: 'hide'}
 };
 
-// When using multiple event hooks, subsequent events within the defined timeframe, in milliseconds, will be ignored.
-// Allows for safe stacking of similar event hooks without the popover flickering.
-const debounceMilliseconds = 200;
-
 export default {
     replace: true,
 
@@ -105,6 +101,13 @@ export default {
 
                 return false;
             }
+        },
+        debounce: {
+            type: [Number],
+            default: 100,
+            validator(value) {
+                return value >= 0;
+            }
         }
     },
 
@@ -255,7 +258,7 @@ export default {
          */
         eventHandler(e) {
             // If this event is right after a previous successful event, ignore it
-            if (this.useDebounce && this.lastEvent !== null && e.timeStamp <= this.lastEvent + debounceMilliseconds) {
+            if (this.useDebounce && this.debounce > 0 && this.lastEvent !== null && e.timeStamp <= this.lastEvent + this.debounce) {
                 return;
             }
 
@@ -267,7 +270,7 @@ export default {
                         const action = triggerListeners[trigger][event];
 
                         // If the expected event action is the opposite of the current state, allow it
-                        if (action === 'toggle' || (this.showState && action === 'hide') || action === 'show') {
+                        if (action === 'toggle' || (this.showState && action === 'hide') || (!this.showState && action === 'show')) {
                             this.showState = !this.showState;
                             this.lastEvent = e.timeStamp;
                         }
