Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions common/static/js/vendor/jquery-ui.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common/templates/xblock_v2/xblock_iframe.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
$.ajaxWithPrefix = $.ajax;
</script>
<!-- The Video XBlock requires "Slider" from jQuery-UI: -->
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
<script src="https://code.jquery.com/ui/1.14.1/jquery-ui.min.js"></script>
<!-- The video XBlock depends on Underscore.JS -->
<script type="text/javascript" src="{{ lms_root_url }}/static/common/js/vendor/underscore.js"></script>
<!-- The video XBlock depends on jquery-cookie -->
Expand Down
9 changes: 9 additions & 0 deletions xmodule/assets/video/public/js/03_video_player.js
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,16 @@ function _restartUsingFlash(state) {
// ***************************************************************

function destroy() {
// Guard against re-entrant or double destroy calls.
// jQuery UI 1.14.1 patches $.cleanData to fire triggerHandler("remove") on
// elements with 'remove' event handlers. The player.on('remove', state.videoPlayer.destroy)
// binding can cause destroy() to be called again while already running.
if (!this.videoPlayer) { return; }
let player = this.videoPlayer.player;
// Remove the 'remove' event handler immediately to prevent the patched
// $.cleanData (jQuery UI 1.14.1) from calling destroy() again when the
// video element is cleaned up later in this same destroy chain.
if (this.videoEl) { this.videoEl.off('remove', this.videoPlayer.destroy); }
this.el.removeClass([
'is-unstarted', 'is-playing', 'is-paused', 'is-buffered',
'is-ended', 'is-cued'
Expand Down
Loading
Loading