lasers/FreeTube
1
0
Fork 0
mirror of https://github.com/FreeTubeApp/FreeTube synced 2024-12-11 12:09:35 +01:00
Code Issues Projects Releases Wiki Activity

! Fix profile menu toggle button to toggle menu instead of keep opening (#1437)

Browse Source 
* ! Fix profile menu toggle button to toggle menu instead of keep opening

* ! Fix togglable buttons to toggle menu instead of keep opening
This commit is contained in:
PikachuEXE 2021-08-25 22:39:38 +08:00 committed by GitHub
parent f645bc512b
commit 8821613d6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/renderer/components/ft-icon-button/ft-icon-button.js
View File

@ -51,7 +51,7 @@ export default Vue.extend({
},
data: function () {
return {
showDropdown: false,
dropdownShown: false,
id: ''
}
},
@ -60,25 +60,46 @@ export default Vue.extend({
},
methods: {
toggleDropdown: function () {
$(`#${this.id}`)[0].style.display = 'inline'
$(`#${this.id}`).focus()
const dropdownBox = $(`#${this.id}`)
$(`#${this.id}`).focusout(() => {
const shareLinks = $(`#${this.id}`).find('.shareLinks')
if (this.dropdownShown) {
dropdownBox.get(0).style.display = 'none'
this.dropdownShown = false
} else {
dropdownBox.get(0).style.display = 'inline'
dropdownBox.get(0).focus()
this.dropdownShown = true
if (shareLinks.length > 0) {
if (!shareLinks[0].parentNode.matches(':hover')) {
$(`#${this.id}`)[0].style.display = 'none'
dropdownBox.focusout(() => {
const shareLinks = dropdownBox.find('.shareLinks')
if (shareLinks.length > 0) {
if (!shareLinks[0].parentNode.matches(':hover')) {
dropdownBox.get(0).style.display = 'none'
// When pressing the profile button
// It will make the menu reappear if we set `dropdownShown` immediately
setTimeout(() => {
this.dropdownShown = false
}, 100)
}
} else {
dropdownBox.get(0).style.display = 'none'
// When pressing the profile button
// It will make the menu reappear if we set `dropdownShown` immediately
setTimeout(() => {
this.dropdownShown = false
}, 100)
}
} else {
$(`#${this.id}`)[0].style.display = 'none'
}
})
})
}
},
focusOut: function () {
$(`#${this.id}`).focusout()
$(`#${this.id}`)[0].style.display = 'none'
const dropdownBox = $(`#${this.id}`)
dropdownBox.focusout()
dropdownBox.get(0).style.display = 'none'
this.dropdownShown = false
},
handleIconClick: function () {

19
src/renderer/components/ft-profile-selector/ft-profile-selector.js
View File

@ -13,7 +13,7 @@ export default Vue.extend({
},
data: function () {
return {
showProfileList: false
profileListShown: false
}
},
computed: {
@ -38,12 +38,25 @@ export default Vue.extend({
mounted: function () {
$('#profileList').focusout(() => {
$('#profileList')[0].style.display = 'none'
// When pressing the profile button
// It will make the menu reappear if we set `profileListShown` immediately
setTimeout(() => {
this.profileListShown = false
}, 100)
})
},
methods: {
toggleProfileList: function () {
$('#profileList')[0].style.display = 'inline'
$('#profileList').focus()
const profileList = $('#profileList')
if (this.profileListShown) {
profileList.get(0).style.display = 'none'
this.profileListShown = false
} else {
profileList.get(0).style.display = 'inline'
profileList.get(0).focus()
this.profileListShown = true
}
},
openProfileSettings: function () {