Merge branch 'dev'

PygmySlowLoris · Sep 29, 2017 · 5ff75b0 · 5ff75b0
2 parents 2a17449 + b082d85
commit 5ff75b0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/dist/build.js b/dist/build.js
diff --git a/dist/build.js.map b/dist/build.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-fab",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Vue Floating Action Button",
   "main": "src/index.js",
   "repository": {

diff --git a/src/FAB.vue b/src/FAB.vue
@@ -13,7 +13,7 @@
                                 leave-active-class="animated quick zoomOut"
                         >
                             <template v-if="action.tooltip">
-                                <li v-show="toggle" :style="{ 'background-color': action.color || bgColor }"
+                                <li v-if="toggle" :style="{ 'background-color': action.color || bgColor }"
                                     v-tooltip="{ content: action.tooltip, placement: tooltipPosition, classes: 'fab-tooltip', trigger: tooltipTrigger}"
                                     @click="toParent(action.name)" class="pointer"
                                     ref="actions">
@@ -266,14 +266,12 @@
                     //timeout to prevent wrong position for the tooltip
                     setTimeout(() => {
                         this.$refs.actions.forEach((item) => {
-                            item._tooltip.show();
+                            if(this.toggle) {
+                                item._tooltip.show();
+                            }
                         });
-                    },600);
+                    },700);
 
-                }else{
-                    this.$refs.actions.forEach((item) => {
-                        item._tooltip.hide();
-                    });
                 }
             }
         },