Merge branch '1.2.2_BRANCH' into develop

Step/wwwroot/src/modules/base-components/cards/softkeys-prefered.vue

@@ -1,6 +1,7 @@
 <template>
 <!-- <div class="test-container"> -->
-      <div class="softkeys-prefered" :class="{menuopened: menuOpened,disabled: checkdisabled || checkSecurityDisabled('userSoftkeys'),otherMenuOpened: otherMenuOpened, selected: selected, active: (active && type==1)}" @click="otherMenuOpened ? closeotherMenu() :null || type == 2 ? toggleMenu() : null || type == 0 ? toggleCheck() : null || type == 1 ? onClick() : null">
+      <div class="softkeys-prefered" :class="{menuopened: menuOpened,disabled: checkdisabled || checkSecurityDisabled('userSoftkeys'),otherMenuOpened: otherMenuOpened, selected: selected, active: (active && type==1)}" 
+      @click="otherMenuOpened ? closeotherMenu() :null || type == 2 ? toggleMenu() : null || type == 0 ? toggleCheck() : null || type == 1 ? onClick($event) : null">
           <div class="star">
               <img src="assets/icons/_png/star-24x24.png" />
           </div>
@@ -8,12 +9,12 @@
               {{title}}
           </div>
           <div class="control">
-              <div class="button" v-if="type==1" @click="onClick()">
+              <div class="button" v-if="type==1" @click="onClick($event)">
                 <i class="fa fa-arrow-right"></i>
               </div>
               <div class="togglebutton" v-if="type==0">
                 <label>
-                  <input type="checkbox" :checked="ischecked" @click='toggleCheck()'>
+                  <input type="checkbox" :checked="ischecked" @click="checkboxClick($event)">
                   <span class="toggle">{{checked?onLabel:offLabel}}</span>
                 </label>
               </div>
@@ -123,6 +124,9 @@ export default {
 
   },
   methods:{
+    checkboxClick: function (event) {
+      event.stopPropagation();  
+    }, 
     getSoftKeyStatus(id) {
       if (this.subkeysStatus) return this.subkeysStatus[id] || false;
       return false;
@@ -159,9 +163,10 @@ export default {
     toggleOnOff(){
       this.bindingValue = !this.bindingValue; 
     },
-    onClick: function() {
+    onClick: function(event) {
       if(!this.otherMenuOpened && !this.checkdisabled)
         this.$emit("click");
+        event.stopPropagation();
     }
   }
 };