Merge pull request bootstrap-vue#142 from mosinve/master

pi0 · web-flow · commit addd10e54959 · 2017-03-13T13:06:56.000+03:30
Update modal.vue
diff --git a/components/modal.vue b/components/modal.vue
@@ -110,8 +110,8 @@ export default {
     },
     created() {
         const hub = this.$root;
-        hub.$on('show::modal', id => id === this.id && this.show());
-        hub.$on('hide::modal', id => id === this.id && this.hide());
+        hub.$on('show::modal', id => id === this.id && this.show()).bind(this);
+        hub.$on('hide::modal', id => id === this.id && this.hide()).bind(this);
     },
     mounted() {
         document.addEventListener('keydown', this.pressedButton);
diff --git a/components/nav-item-dropdown.vue b/components/nav-item-dropdown.vue
@@ -1,10 +1,9 @@
 <template>
   <li :class="{'nav-item': true, show: show,
                dropdown: !dropup, dropup: dropup}">
-    <a @click.stop="toggle($event)"
+    <a @click.stop.prevent="toggle($event)"
        :class="['nav-link', dropdownToggle]"
-       href="" v-on:click.prevent=""
-       aria-haspopup="true"
+       href="" aria-haspopup="true"
        :aria-expanded="show"
        :disabled="disabled">
       <slot>{{ text }}</slot>
@@ -52,27 +51,35 @@
           class: ['class']
       },
       methods: {
-          toggle(e) {
-        // return if disabled
-              if (this.disabled) {
+          setShow(state) {
+              if (this.show === state) {
                   return;
-              }
-        // hide an alert
-              this.show = !this.show;
-        // Dispatch an event from the current vm that propagates all the way up to its $root
+              } // Avoid duplicated emits
+              this.show = state;
+
               if (this.show) {
                   this.$root.$emit('shown::dropdown');
-                  e.stopPropagation();
               } else {
                   this.$root.$emit('hidden::dropdown');
               }
-          }
+          },
+          toggle() {
+              this.setShow(!this.show);
+          },
+          clickOut() {
+              this.setShow(false);
+          },
       },
       created() {
           const hub = this.$root;
           hub.$on('hide::dropdown', () => {
               this.show = false;
           });
+      },
+      mounted() {
+          if (typeof document !== 'undefined') {
+              document.documentElement.addEventListener('click', this.clickOut);
+          }
       }
   };
 </script>
