vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-07 08:07:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a timestamp to the urls passed to <audio> and <video> in the modal to ensure that cached view instances aren't referenced by MEjs. Pause the player when closing the controller's modal.

Browse Source 
See #27016, #26779.



git-svn-id: https://develop.svn.wordpress.org/trunk@27420 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2014-03-05 21:36:32 +00:00
parent f12d7bb35c
commit 5efb7cde7e
2 changed files with 69 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-includes/js/media-views.js
+4 -18
View File
@@ -6239,7 +6239,7 @@
media.view.Settings.AttachmentDisplay.prototype.render.apply( this, arguments );
setTimeout( function() { self.resetFocus(); }, 10 );
new MediaElementPlayer( this.$('audio').get(0), settings );
new MediaElementPlayer( this.$('.wp-audio-shortcode').get(0), settings );
return this;
},
@@ -6264,13 +6264,10 @@
template: media.template('video-details'),
initialize: function() {
_.bindAll(this, 'player', 'played');
_.bindAll(this, 'player');
this.removable = false;
this.listenTo( this.controller, 'close', this.close );
// used in AttachmentDisplay.prototype.updateLinkTo
this.options.attachment = this.model.attachment;
media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );
},
@@ -6287,20 +6284,12 @@
},
close : function() {
if ( this.removable ) {
this.mejs.pause();
}
this.mejs.pause();
this.remove();
this.mejs = this.mejsInstance = null;
},
played : function () {
this.removable = true;
},
player : function (mejs) {
this.mejs = mejs;
this.mejs.addEventListener( 'play', this.played );
},
render: function() {
@@ -6315,10 +6304,7 @@
media.view.Settings.AttachmentDisplay.prototype.render.apply( this, arguments );
setTimeout( function() { self.resetFocus(); }, 10 );
if ( ! this.mejsInstance ) {
this.mejsInstance = new MediaElementPlayer( this.$('video').get(0), settings );
}
new MediaElementPlayer( this.$('.wp-video-shortcode').get(0), settings );
return this;
},