Skip to content

Commit f22509a

Browse files
Merge pull request #6343 from Countly/SER-2423-toogle-button-bugfixes-ce
[SER-2423] publish button interactions
2 parents 6d69c9d + b1a1a58 commit f22509a

File tree

2 files changed

+28
-14
lines changed

2 files changed

+28
-14
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@
121121
'input',
122122
'save',
123123
'switch-toggle',
124-
'tab-change'
124+
'tab-change',
125+
'publish-button-click'
125126
],
126127

127128
data() {
@@ -204,6 +205,10 @@
204205
},
205206

206207
onPublishButtonClick() {
208+
if (this.isToggleDisabled) {
209+
this.$emit('publish-button-click');
210+
return;
211+
}
207212
this.toggleLocalValue = !this.toggleLocalValue;
208213
},
209214

frontend/express/public/javascripts/countly/vue/templates/content/content-header.html

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565

6666
<el-button
6767
v-if="!hideSaveButton"
68+
id="journey-save-button"
6869
class="cly-vue-content-builder-header__save-button"
6970
data-test-id="content-header-save-button"
7071
:disabled="disableSaveButton"
@@ -75,21 +76,29 @@
7576
>
7677
{{ saveButtonLabel }}
7778
</el-button>
78-
<el-button
79+
<div
7980
v-if="toggle"
80-
v-tooltip.down="toggleTooltip"
81-
:disabled="isToggleDisabled"
82-
class="cly-vue-content-builder-header__save-button"
83-
test-id="journey-publish"
84-
:type="toggleLocalValue ? 'warning' : 'success'"
85-
size="small"
86-
@click="onPublishButtonClick"
81+
style="display: inline-block; margin-left: 8px;"
8782
>
88-
<template v-if="toggleLocalValue">
89-
<i class="cly-is cly-is-pause" style="margin-right: 4px;"></i>
90-
</template>
91-
{{ toggleLocalValue ? 'Pause': 'Publish' }}
92-
</el-button>
83+
<button
84+
v-tooltip.down="toggleTooltip"
85+
:class="[
86+
'cly-vue-content-builder-header__save-button',
87+
'el-button',
88+
'el-button--small',
89+
isToggleDisabled ? 'is-disabled' : '',
90+
toggleLocalValue ? 'el-button--warning' : 'el-button--success'
91+
]"
92+
test-id="journey-publish"
93+
:disabled="false"
94+
@click="onPublishButtonClick"
95+
>
96+
<template v-if="toggleLocalValue">
97+
<i class="cly-is cly-is-pause" style="margin-right: 4px;"></i>
98+
</template>
99+
{{ toggleLocalValue ? 'Pause': 'Publish' }}
100+
</button>
101+
</div>
93102
<cly-more-options
94103
v-if="isOptionsButtonVisible"
95104
class="cly-vue-content-builder-header__options-button"

0 commit comments

Comments
 (0)