<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27631] trunk/src/wp-includes/js: Move `wp.media.view.MediaDetails` to `media-audiovideo.js`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27631">27631</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-20 02:44:26 +0000 (Thu, 20 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move `wp.media.view.MediaDetails` to `media-audiovideo.js`. This should have moved over with the rest.
See <a href="http://core.trac.wordpress.org/changeset/27608">[27608]</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaaudiovideojs">trunk/src/wp-includes/js/media-audiovideo.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaaudiovideojs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-audiovideo.js (27630 => 27631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-audiovideo.js 2014-03-20 01:30:49 UTC (rev 27630)
+++ trunk/src/wp-includes/js/media-audiovideo.js 2014-03-20 02:44:26 UTC (rev 27631)
</span><span class="lines">@@ -785,6 +785,133 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * wp.media.view.MediaDetails
+ *
+ * @contructor
+ * @augments wp.media.view.Settings.AttachmentDisplay
+ * @augments wp.media.view.Settings
+ * @augments wp.media.View
+ * @augments wp.Backbone.View
+ * @augments Backbone.View
+ */
+ media.view.MediaDetails = media.view.Settings.AttachmentDisplay.extend({
+ initialize: function() {
+ _.bindAll(this, 'success');
+
+ this.listenTo( this.controller, 'close', media.mixin.unsetPlayer );
+ this.on( 'ready', this.setPlayer );
+ this.on( 'media:setting:remove', media.mixin.unsetPlayer, this );
+ this.on( 'media:setting:remove', this.render );
+ this.on( 'media:setting:remove', this.setPlayer );
+ this.events = _.extend( this.events, {
+ 'click .remove-setting' : 'removeSetting',
+ 'change .content-track' : 'setTracks',
+ 'click .remove-track' : 'setTracks'
+ } );
+
+ media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );
+ },
+
+ prepare: function() {
+ return _.defaults({
+ model: this.model.toJSON()
+ }, this.options );
+ },
+
+ removeSetting : function (e) {
+ var wrap = $( e.currentTarget ).parent(), setting;
+
+ setting = wrap.find( 'input' ).data( 'setting' );
+
+ if ( setting ) {
+ this.model.unset( setting );
+ this.trigger( 'media:setting:remove', this );
+ }
+
+ wrap.remove();
+ },
+
+ setTracks : function () {
+ var tracks = '';
+
+ _.each( this.$('.content-track'), function (track) {
+ tracks += $( track ).val();
+ } );
+
+ this.model.set( 'content', tracks );
+ this.trigger( 'media:setting:remove', this );
+ },
+
+ setPlayer : function () {
+ if ( ! this.player && this.media ) {
+ this.player = new MediaElementPlayer( this.media, this.settings );
+ }
+ },
+
+ /**
+ * @abstract
+ */
+ setMedia : function () {
+ return this;
+ },
+
+ success : function (mejs) {
+ var autoplay = mejs.attributes.autoplay && 'false' !== mejs.attributes.autoplay;
+
+ if ( 'flash' === mejs.pluginType && autoplay ) {
+ mejs.addEventListener( 'canplay', function () {
+ mejs.play();
+ }, false );
+ }
+
+ this.mejs = mejs;
+ },
+
+ render: function() {
+ var self = this, settings = {
+ success : this.success
+ };
+
+ if ( ! _.isUndefined( window._wpmejsSettings ) ) {
+ settings.pluginPath = _wpmejsSettings.pluginPath;
+ }
+
+ media.view.Settings.AttachmentDisplay.prototype.render.apply( this, arguments );
+ setTimeout( function() { self.resetFocus(); }, 10 );
+
+ this.settings = settings;
+
+ return this.setMedia();
+ },
+
+ resetFocus: function() {
+ this.$( '.embed-media-settings' ).scrollTop( 0 );
+ }
+ }, {
+ instances : 0,
+
+ /**
+ * When multiple players in the DOM contain the same src, things get weird.
+ *
+ * @param {HTMLElement} media
+ * @returns {HTMLElement}
+ */
+ prepareSrc : function (media) {
+ var i = wp.media.view.MediaDetails.instances++;
+ _.each( $(media).find('source'), function (source) {
+ source.src = [
+ source.src,
+ source.src.indexOf('?') > -1 ? '&' : '?',
+ '_=',
+ i
+ ].join('');
+ });
+
+ return media;
+ }
+ });
+
+ /**
</ins><span class="cx"> * wp.media.view.AudioDetails
</span><span class="cx"> *
</span><span class="cx"> * @contructor
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (27630 => 27631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-03-20 01:30:49 UTC (rev 27630)
+++ trunk/src/wp-includes/js/media-views.js 2014-03-20 02:44:26 UTC (rev 27631)
</span><span class="lines">@@ -6050,133 +6050,6 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * wp.media.view.MediaDetails
- *
- * @contructor
- * @augments wp.media.view.Settings.AttachmentDisplay
- * @augments wp.media.view.Settings
- * @augments wp.media.View
- * @augments wp.Backbone.View
- * @augments Backbone.View
- */
- media.view.MediaDetails = media.view.Settings.AttachmentDisplay.extend({
- initialize: function() {
- _.bindAll(this, 'success');
-
- this.listenTo( this.controller, 'close', media.mixin.unsetPlayer );
- this.on( 'ready', this.setPlayer );
- this.on( 'media:setting:remove', media.mixin.unsetPlayer, this );
- this.on( 'media:setting:remove', this.render );
- this.on( 'media:setting:remove', this.setPlayer );
- this.events = _.extend( this.events, {
- 'click .remove-setting' : 'removeSetting',
- 'change .content-track' : 'setTracks',
- 'click .remove-track' : 'setTracks'
- } );
-
- media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );
- },
-
- prepare: function() {
- return _.defaults({
- model: this.model.toJSON()
- }, this.options );
- },
-
- removeSetting : function (e) {
- var wrap = $( e.currentTarget ).parent(), setting;
-
- setting = wrap.find( 'input' ).data( 'setting' );
-
- if ( setting ) {
- this.model.unset( setting );
- this.trigger( 'media:setting:remove', this );
- }
-
- wrap.remove();
- },
-
- setTracks : function () {
- var tracks = '';
-
- _.each( this.$('.content-track'), function (track) {
- tracks += $( track ).val();
- } );
-
- this.model.set( 'content', tracks );
- this.trigger( 'media:setting:remove', this );
- },
-
- setPlayer : function () {
- if ( ! this.player && this.media ) {
- this.player = new MediaElementPlayer( this.media, this.settings );
- }
- },
-
- /**
- * @abstract
- */
- setMedia : function () {
- return this;
- },
-
- success : function (mejs) {
- var autoplay = mejs.attributes.autoplay && 'false' !== mejs.attributes.autoplay;
-
- if ( 'flash' === mejs.pluginType && autoplay ) {
- mejs.addEventListener( 'canplay', function () {
- mejs.play();
- }, false );
- }
-
- this.mejs = mejs;
- },
-
- render: function() {
- var self = this, settings = {
- success : this.success
- };
-
- if ( ! _.isUndefined( window._wpmejsSettings ) ) {
- settings.pluginPath = _wpmejsSettings.pluginPath;
- }
-
- media.view.Settings.AttachmentDisplay.prototype.render.apply( this, arguments );
- setTimeout( function() { self.resetFocus(); }, 10 );
-
- this.settings = settings;
-
- return this.setMedia();
- },
-
- resetFocus: function() {
- this.$( '.embed-media-settings' ).scrollTop( 0 );
- }
- }, {
- instances : 0,
-
- /**
- * When multiple players in the DOM contain the same src, things get weird.
- *
- * @param {HTMLElement} media
- * @returns {HTMLElement}
- */
- prepareSrc : function (media) {
- var i = wp.media.view.MediaDetails.instances++;
- _.each( $(media).find('source'), function (source) {
- source.src = [
- source.src,
- source.src.indexOf('?') > -1 ? '&' : '?',
- '_=',
- i
- ].join('');
- });
-
- return media;
- }
- });
-
- /**
</del><span class="cx"> * wp.media.view.Spinner
</span><span class="cx"> *
</span><span class="cx"> * @constructor
</span></span></pre>
</div>
</div>
</body>
</html>