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

Videos in the media modal:

Browse Source 
* Support rendering of chromeless YouTube when a video shortcode's `src` is a YouTube URL. 
* Don't instantiate an instance of `MediaElementPlayer` until after the view has been attached to the DOM and the view's `ready` event has fired.
* Don't set `poster` for videos when its value is empty. Much like `src` in the `img` tag - when empty, it will assume and load the current window's URL.
* When removing a player instance, don't call the `pause` method if the playback is not native.

See #27016.



git-svn-id: https://develop.svn.wordpress.org/trunk@27452 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2014-03-07 08:31:57 +00:00
parent 5e5caca113
commit 0143c2d90a
2 changed files with 72 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-includes/js/media-views.js
+28 -11
View File
@@ -6384,6 +6384,7 @@
_.bindAll(this, 'success', 'close');
this.listenTo( this.controller, 'close', this.close );
this.on( 'ready', this.setPlayer );
media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );
},
@@ -6411,7 +6412,16 @@
},
setPlayer : function () {
this.player = false;
if ( ! this.player ) {
this.player = new MediaElementPlayer( this.media, this.settings );
}
},
/**
* @abstract
*/
setMedia : function () {
return this;
},
/**
@@ -6449,8 +6459,11 @@
close : function() {
if ( this.player ) {
this.mejs.pause();
if ( _.isUndefined( this.mejs.pluginType ) ) {
this.mejs.pause();
}
this.remove();
this.player = false;
}
},
@@ -6478,9 +6491,9 @@
media.view.Settings.AttachmentDisplay.prototype.render.apply( this, arguments );
setTimeout( function() { self.resetFocus(); }, 10 );
this.setPlayer( settings );
this.settings = settings;
return this;
return this.setMedia();
},
resetFocus: function() {
@@ -6503,12 +6516,11 @@
className: 'audio-details',
template: media.template('audio-details'),
setPlayer: function( settings ) {
setMedia: function() {
var audio = this.$('.wp-audio-shortcode').get(0);
audio = this.prepareSrc( audio );
this.media = this.prepareSrc( audio );
this.player = new MediaElementPlayer( audio, settings );
return this;
}
});
@@ -6528,12 +6540,17 @@
className: 'video-details',
template: media.template('video-details'),
setPlayer: function( settings ) {
var video = this.$('.wp-video-shortcode').get(0);
setMedia: function() {
var video = this.$('.wp-video-shortcode');
video = this.prepareSrc( video );
if ( ! video.hasClass('youtube-video') ) {
video = this.prepareSrc( video.get(0) );
} else {
video = video.get(0);
}
this.media = video;
this.player = new MediaElementPlayer( video, settings );
return this;
}
});