ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix menu transitionend event listener

Browse Source
This commit is contained in:
Albin Larsson 2018-06-15 05:51:23 +02:00
parent 8257857075
commit cf5f77c709
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/controls.js vendored
View File

@ -10,7 +10,7 @@ import { repaint, transitionEndEvent } from './utils/animation';
import { dedupe } from './utils/arrays'; import { dedupe } from './utils/arrays';
import browser from './utils/browser'; import browser from './utils/browser';
import { createElement, emptyElement, getAttributesFromSelector, getElement, getElements, hasClass, removeElement, setAttributes, toggleClass, toggleHidden, toggleState } from './utils/elements'; import { createElement, emptyElement, getAttributesFromSelector, getElement, getElements, hasClass, removeElement, setAttributes, toggleClass, toggleHidden, toggleState } from './utils/elements';
import { once } from './utils/events'; import { on, off } from './utils/events';
import is from './utils/is'; import is from './utils/is';
import loadSprite from './utils/loadSprite'; import loadSprite from './utils/loadSprite';
import { extend } from './utils/objects'; import { extend } from './utils/objects';
@ -1026,7 +1026,7 @@ const controls = {
return; return;
} }
// Are we targetting a tab? If not, bail // Are we targeting a tab? If not, bail
const isTab = pane.getAttribute('role') === 'tabpanel'; const isTab = pane.getAttribute('role') === 'tabpanel';
if (!isTab) { if (!isTab) {
return; return;
@ -1065,10 +1065,12 @@ const controls = {
container.style.width = ''; container.style.width = '';
container.style.height = ''; container.style.height = '';
// Only listen once
off.call(this, container, transitionEndEvent, restore);
}; };
// Listen for the transition finishing and restore auto height/width // Listen for the transition finishing and restore auto height/width
once.call(this, container, transitionEndEvent, restore); on.call(this, container, transitionEndEvent, restore);
// Set dimensions to target // Set dimensions to target
container.style.width = `${size.width}px`; container.style.width = `${size.width}px`;

10
src/js/plyr.js
View File

@ -833,7 +833,7 @@ class Plyr {
* @param {boolean} input - Whether to enable captions * @param {boolean} input - Whether to enable captions
*/ */
toggleCaptions(input) { toggleCaptions(input) {
captions.toggle.call(this, input); captions.toggle.call(this, input, false);
} }
/** /**
@ -841,15 +841,15 @@ class Plyr {
* @param {number} - Caption index * @param {number} - Caption index
*/ */
set currentTrack(input) { set currentTrack(input) {
captions.set.call(this, input); captions.set.call(this, input, false);
} }
/** /**
* Get the current caption track index (-1 if disabled) * Get the current caption track index (-1 if disabled)
*/ */
get currentTrack() { get currentTrack() {
const { active, currentTrack } = this.captions; const { toggled, currentTrack } = this.captions;
return active ? currentTrack : -1; return toggled ? currentTrack : -1;
} }
/** /**
@ -858,7 +858,7 @@ class Plyr {
* @param {string} - Two character ISO language code (e.g. EN, FR, PT, etc) * @param {string} - Two character ISO language code (e.g. EN, FR, PT, etc)
*/ */
set language(input) { set language(input) {
captions.setLanguage.call(this, input); captions.setLanguage.call(this, input, false);
} }
/** /**