aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/assets/player/videojs-components/settings-menu-item.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-01-24 10:16:30 +0100
committerChocobozzz <chocobozzz@cpy.re>2019-02-11 09:13:02 +0100
commit3b6f205c34bb931de0323581edf991ca33256e6b (patch)
treef6ba40b7c666e38ff9c321906f04cb2c2630163e /client/src/assets/player/videojs-components/settings-menu-item.ts
parent2adfc7ea9a1f858db874df9fe322e7ae833db77c (diff)
downloadPeerTube-3b6f205c34bb931de0323581edf991ca33256e6b.tar.gz
PeerTube-3b6f205c34bb931de0323581edf991ca33256e6b.tar.zst
PeerTube-3b6f205c34bb931de0323581edf991ca33256e6b.zip
Correctly implement p2p-media-loader
Diffstat (limited to 'client/src/assets/player/videojs-components/settings-menu-item.ts')
-rw-r--r--client/src/assets/player/videojs-components/settings-menu-item.ts10
1 files changed, 8 insertions, 2 deletions
diff --git a/client/src/assets/player/videojs-components/settings-menu-item.ts b/client/src/assets/player/videojs-components/settings-menu-item.ts
index b9a430290..f14959f9c 100644
--- a/client/src/assets/player/videojs-components/settings-menu-item.ts
+++ b/client/src/assets/player/videojs-components/settings-menu-item.ts
@@ -223,6 +223,11 @@ class SettingsMenuItem extends MenuItem {
223 this.subMenu.on('updateLabel', () => { 223 this.subMenu.on('updateLabel', () => {
224 this.update() 224 this.update()
225 }) 225 })
226 this.subMenu.on('menuChanged', () => {
227 this.bindClickEvents()
228 this.setSize()
229 this.update()
230 })
226 231
227 this.settingsSubMenuTitleEl_.innerHTML = this.player_.localize(this.subMenu.controlText_) 232 this.settingsSubMenuTitleEl_.innerHTML = this.player_.localize(this.subMenu.controlText_)
228 this.settingsSubMenuEl_.appendChild(this.subMenu.menu.el_) 233 this.settingsSubMenuEl_.appendChild(this.subMenu.menu.el_)
@@ -230,7 +235,7 @@ class SettingsMenuItem extends MenuItem {
230 this.update() 235 this.update()
231 236
232 this.createBackButton() 237 this.createBackButton()
233 this.getSize() 238 this.setSize()
234 this.bindClickEvents() 239 this.bindClickEvents()
235 240
236 // prefixed event listeners for CSS TransitionEnd 241 // prefixed event listeners for CSS TransitionEnd
@@ -292,8 +297,9 @@ class SettingsMenuItem extends MenuItem {
292 297
293 // save size of submenus on first init 298 // save size of submenus on first init
294 // if number of submenu items change dynamically more logic will be needed 299 // if number of submenu items change dynamically more logic will be needed
295 getSize () { 300 setSize () {
296 this.dialog.removeClass('vjs-hidden') 301 this.dialog.removeClass('vjs-hidden')
302 videojsUntyped.dom.removeClass(this.settingsSubMenuEl_, 'vjs-hidden')
297 this.size = this.settingsButton.getComponentSize(this.settingsSubMenuEl_) 303 this.size = this.settingsButton.getComponentSize(this.settingsSubMenuEl_)
298 this.setMargin() 304 this.setMargin()
299 this.dialog.addClass('vjs-hidden') 305 this.dialog.addClass('vjs-hidden')