Merge branch 'next' into SER-1129

Cookiezaurs · web-flow · commit 98b3af38578f · 2024-10-31T10:40:09.000+02:00
diff --git a/plugins/guides/frontend/public/javascripts/countly.views.js b/plugins/guides/frontend/public/javascripts/countly.views.js
@@ -229,7 +229,6 @@
                 }
             },
             onClose: function() {
-                // EMRE: View Guides button closing animation flag here
                 this.isDialogVisible = false;
                 let mainViewContainer = document.getElementById('main-views-container');
                 mainViewContainer.getElementsByClassName('main-view')[0].style.setProperty('overflow', 'auto', 'important');
diff --git a/plugins/guides/frontend/public/templates/dialog.html b/plugins/guides/frontend/public/templates/dialog.html
@@ -1,5 +1,4 @@
 <div class="guide-dialog-wrapper">
-    <!-- EMRE: this section here should have the animation, with closing animation happening after closing guides page -->
     <div v-if="isButtonVisible" data-test-id="view-guide-button" :class="dynamicClassGuideButton" @click="onClick">
         <span class="icon">
             <img src="images/icons/book-open.svg" alt="Icon"/>

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,6 @@`
`229`	`229`	`}`
`230`	`230`	`},`
`231`	`231`	`onClose: function() {`
`232`		`- // EMRE: View Guides button closing animation flag here`
`233`	`232`	`this.isDialogVisible = false;`
`234`	`233`	`let mainViewContainer = document.getElementById('main-views-container');`
`235`	`234`	`mainViewContainer.getElementsByClassName('main-view')[0].style.setProperty('overflow', 'auto', 'important');`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<div class="guide-dialog-wrapper">`
`2`		`- <!-- EMRE: this section here should have the animation, with closing animation happening after closing guides page -->`
`3`	`2`	`<div v-if="isButtonVisible" data-test-id="view-guide-button" :class="dynamicClassGuideButton" @click="onClick">`
`4`	`3`	`<span class="icon">`
`5`	`4`	`<img src="images/icons/book-open.svg" alt="Icon"/>`