Merge branch 'master' into master

Author: Puredbest

Template/App.vue

@@ -9,7 +9,8 @@
             <iv-increment-button :initialValue="2" :increment="1" :minimum="min" :maximum="max"> </iv-increment-button>
             <iv-toggle-advance id="toggle2"  :initialModeIndex=0 @toggleswitched="sChange" position="centre"></iv-toggle-advance>
             <iv-toggle-advance id="toggle3" :togglesDisabled=disableList :initialModeIndex=1 position="centre"></iv-toggle-advance>
-            <iv-tickbox></iv-tickbox>            
+            <iv-tickbox></iv-tickbox>        
+            <iv-dropdown-list :initialDropdownIndex=1 @dropdownelementclicked="changeXlabel" ></iv-dropdown-list> 
 
         </iv-DraggableDiv>
         <iv-visualisation :title="projectName">
@@ -95,6 +96,10 @@ export default {
         },
         paneResize(e){
             console.log("new pane width: ", e)
+        },
+        changeXlabel(e){
+            console.log("here");
+            console.log(e);
         }
     }
 }

package.json

@@ -1,9 +1,11 @@
 {
   "name": "@impvis/components",
 
+
   "version": "1.4.8",
 
 
+
   "license": "BSD-3-Clause",
   "main": "./dist/impvis-components.js",
   "unpkg": "./dist/impvis-components.umd.js",

src/components/DropdownList/DropdownList.vue

@@ -8,7 +8,8 @@
 </template>
 
 <script>
-import DropdownListElement from "./DropdownListElement.vue"
+import DropdownListElement from "./DropdownListElement.vue";
+import {eventBus} from "@/buses/eventBus";
 export default {
     name:"iv-dropdown-list",
     components: {"iv-dropdown-list-element": DropdownListElement},
@@ -52,7 +53,14 @@ export default {
         }
         this.$emit("dropdownbuttonclicked", e);
       }
-    }
+    },
+    mounted(){
+      eventBus.$on("reset-data", data => {
+        console.log(data);
+        this.dropdownIndex = this.initialDropdownIndex;
+        this.$emit("dropdownelementclicked", this.dropdownIndex);
+      });
+    },
 }
 </script>
 

src/components/ResetButton/ResetButton.vue

@@ -15,8 +15,8 @@ export default {
             this.$emit("mouseleave",e)
         },
         buttonClick(e){
-            this.$emit("click", e)
             eventBus.$emit("reset-data", this.resetChoice)
+            this.$emit("click", e)
         },
     },
     props:{

src/components/SidebarText/SidebarContent.vue

@@ -131,13 +131,19 @@ export default {
         font-weight: 600;
         position:relative;
         opacity:0.75;
+        white-space: nowrap; 
+        overflow: hidden;
+        text-overflow: ellipsis; 
         &.iv-active-button{
             flex-grow:6;
         }
         &:active,&:focus,&.iv-active-button{
             border:none;
             outline:none;
             opacity:1;
+            white-space: nowrap; 
+            overflow: hidden;
+            text-overflow: ellipsis;
         }
     }
     .iv-meter{