Skip to content

Commit 8f6825c

Browse files
committed
fix: code review
1 parent 569a32a commit 8f6825c

File tree

1 file changed

+14
-18
lines changed
  • frontend/express/public/javascripts/countly/vue/components

1 file changed

+14
-18
lines changed

frontend/express/public/javascripts/countly/vue/components/dialog.js

+14-18
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,11 @@
7979
customClass: function() {
8080
return this.alignCenter ? "el-dialog--centered" : "";
8181
},
82-
isButtonDisabled: function() {
83-
return {
84-
save: this.saveButtonDisabled,
85-
cancel: this.cancelButtonDisabled
86-
};
87-
},
88-
buttonStyle: function() {
89-
return function(disabled) {
90-
return disabled ? { opacity: 0.5 } : {};
91-
};
92-
}
9382
},
9483
methods: {
84+
buttonStyle: function(disabled) {
85+
return disabled ? { opacity: 0.5 } : {};
86+
},
9587
confirmClicked: function() {
9688
this.$emit("confirm");
9789
},
@@ -104,12 +96,16 @@
10496
<template v-for="(_, name) in forwardedSlots" v-slot:[name]="slotData">\
10597
<slot :name="name"/>\
10698
</template>\
107-
<template v-slot:footer><div class="cly-vue-formdialog__buttons is-single-step bu-is-justify-content-flex-end bu-is-flex">\
108-
<el-button size="small" :data-test-id="testId + \'-cly-confirm-dialog-cancel-button\'" @click="cancelClicked" type="secondary" :disabled="isButtonDisabled.cancel" :style="buttonStyle(isButtonDisabled.cancel)" v-if="cancelButtonVisibility">{{cancelLabel}}</el-button>\
109-
<el-button size="small" :data-test-id="testId + \'-cly-confirm-dialog-save-button\'" @click="confirmClicked" type="success" :disabled="isButtonDisabled.save" :style="buttonStyle(isButtonDisabled.save)" v-if="confirmStyle==\'success\' && saveButtonVisibility" >{{saveLabel}}</el-button>\
110-
<el-button size="small" :data-test-id="testId + \'-cly-confirm-dialog-warning-button\'" @click="confirmClicked" type="warning" :disabled="isButtonDisabled.save" :style="buttonStyle(isButtonDisabled.save)" v-else-if="confirmStyle==\'warning\' && saveButtonVisibility" >{{saveLabel}}</el-button>\
111-
<el-button size="small" :data-test-id="testId + \'-cly-confirm-dialog-danger-button\'" @click="confirmClicked" type="danger" :disabled="isButtonDisabled.save" :style="buttonStyle(isButtonDisabled.save)" v-else-if="saveButtonVisibility" >{{saveLabel}}</el-button>\
112-
</div></template>\
99+
<template v-slot:footer>\
100+
<slot name="footer">\
101+
<div class="cly-vue-formdialog__buttons is-single-step bu-is-justify-content-flex-end bu-is-flex">\
102+
<el-button size="small" :data-test-id="testId + \'-cly-confirm-dialog-cancel-button\'" @click="cancelClicked" type="secondary" :disabled="cancelButtonDisabled" :style="buttonStyle(cancelButtonDisabled)" v-if="cancelButtonVisibility">{{cancelLabel}}</el-button>\
103+
<el-button size="small" :data-test-id="testId + \'-cly-confirm-dialog-save-button\'" @click="confirmClicked" type="success" :disabled="saveButtonDisabled" :style="buttonStyle(saveButtonDisabled)" v-if="confirmStyle==\'success\' && saveButtonVisibility" >{{saveLabel}}</el-button>\
104+
<el-button size="small" :data-test-id="testId + \'-cly-confirm-dialog-warning-button\'" @click="confirmClicked" type="warning" :disabled="saveButtonDisabled" :style="buttonStyle(saveButtonDisabled)" v-else-if="confirmStyle==\'warning\' && saveButtonVisibility" >{{saveLabel}}</el-button>\
105+
<el-button size="small" :data-test-id="testId + \'-cly-confirm-dialog-danger-button\'" @click="confirmClicked" type="danger" :disabled="saveButtonDisabled" :style="buttonStyle(saveButtonDisabled)" v-else-if="saveButtonVisibility" >{{saveLabel}}</el-button>\
106+
</div>\
107+
</slot>\
108+
</template>\
113109
</el-dialog>'
114110
}));
115111

@@ -274,4 +270,4 @@
274270
countlyVue.mixins.hasFormDialogs = hasFormDialogsMixin;
275271

276272

277-
}(window.countlyVue = window.countlyVue || {}));
273+
}(window.countlyVue = window.countlyVue || {}));

0 commit comments

Comments
 (0)