WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve `wp.media` documentation. 

Props ericlewis.
See #28459.

Built from https://develop.svn.wordpress.org/trunk@30245


git-svn-id: http://core.svn.wordpress.org/trunk@30245 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-11-05 19:39:22 +00:00
parent 2d1080aed1
commit d5a9d63114
4 changed files with 187 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
wp-includes/js/media-models.js
View File

@ -65,7 +65,9 @@ window.wp = window.wp || {};
*/ */
/** /**
* A basic comparator. * A basic equality comparator for Backbone models.
*
* Used to order models within a collection - @see wp.media.model.Attachments.comparator().
* *
* @param {mixed} a The primary parameter to compare. * @param {mixed} a The primary parameter to compare.
* @param {mixed} b The primary parameter to compare. * @param {mixed} b The primary parameter to compare.
@ -87,7 +89,8 @@ window.wp = window.wp || {};
/** /**
* media.template( id ) * media.template( id )
* *
* Fetches a template by id. * Fetch a JavaScript template for an id, and return a templating function for it.
*
* See wp.template() in `wp-includes/js/wp-util.js`. * See wp.template() in `wp-includes/js/wp-util.js`.
* *
* @borrows wp.template as template * @borrows wp.template as template
@ -197,7 +200,7 @@ window.wp = window.wp || {};
/** /**
* wp.media.model.Attachment * wp.media.model.Attachment
* *
* @constructor * @class
* @augments Backbone.Model * @augments Backbone.Model
*/ */
Attachment = media.model.Attachment = Backbone.Model.extend({ Attachment = media.model.Attachment = Backbone.Model.extend({
@ -329,7 +332,7 @@ window.wp = window.wp || {};
} }
}, { }, {
/** /**
* Add a model to the end of the static 'all' collection and return it. * Create a new model on the static 'all' attachments collection and return it.
* *
* @static * @static
* @param {Object} attrs * @param {Object} attrs
@ -339,7 +342,10 @@ window.wp = window.wp || {};
return Attachments.all.push( attrs ); return Attachments.all.push( attrs );
}, },
/** /**
* Retrieve a model, or add it to the end of the static 'all' collection before returning it. * Create a new model on the static 'all' attachments collection and return it.
*
* If this function has already been called for the id,
* it returns the specified attachment.
* *
* @static * @static
* @param {string} id A string used to identify a model. * @param {string} id A string used to identify a model.
@ -354,8 +360,15 @@ window.wp = window.wp || {};
/** /**
* wp.media.model.PostImage * wp.media.model.PostImage
* *
* @constructor * An instance of an image that's been embedded into a post.
*
* Used in the embedded image attachment display settings modal - @see wp.media.view.MediaFrame.ImageDetails.
*
* @class
* @augments Backbone.Model * @augments Backbone.Model
*
* @param {int} [attributes] Initial model attributes.
* @param {int} [attributes.attachment_id] ID of the attachment.
**/ **/
PostImage = media.model.PostImage = Backbone.Model.extend({ PostImage = media.model.PostImage = Backbone.Model.extend({
@ -497,8 +510,24 @@ window.wp = window.wp || {};
/** /**
* wp.media.model.Attachments * wp.media.model.Attachments
* *
* @constructor * A collection of attachments.
*
* This collection has no persistence with the server without supplying
* 'options.props.query = true', which will mirror the collection
* to an Attachments Query collection - @see wp.media.model.Attachments.mirror().
*
* @class
* @augments Backbone.Collection * @augments Backbone.Collection
*
* @param {array} [models] Models to initialize with the collection.
* @param {object} [options] Options hash for the collection.
* @param {string} [options.props] Options hash for the initial query properties.
* @param {string} [options.props.order] Initial order (ASC or DESC) for the collection.
* @param {string} [options.props.orderby] Initial attribute key to order the collection by.
* @param {string} [options.props.query] Whether the collection is linked to an attachments query.
* @param {string} [options.observe]
* @param {string} [options.filters]
*
*/ */
Attachments = media.model.Attachments = Backbone.Collection.extend({ Attachments = media.model.Attachments = Backbone.Collection.extend({
/** /**
@ -522,16 +551,14 @@ window.wp = window.wp || {};
this.props.on( 'change:orderby', this._changeOrderby, this ); this.props.on( 'change:orderby', this._changeOrderby, this );
this.props.on( 'change:query', this._changeQuery, this ); this.props.on( 'change:query', this._changeQuery, this );
// Set the `props` model and fill the default property values.
this.props.set( _.defaults( options.props || {} ) ); this.props.set( _.defaults( options.props || {} ) );
// Observe another `Attachments` collection if one is provided.
if ( options.observe ) { if ( options.observe ) {
this.observe( options.observe ); this.observe( options.observe );
} }
}, },
/** /**
* Automatically sort the collection when the order changes. * Sort the collection when the order attribute changes.
* *
* @access private * @access private
*/ */
@ -625,6 +652,8 @@ window.wp = window.wp || {};
validateDestroyed: false, validateDestroyed: false,
/** /**
* Checks whether an attachment is valid.
*
* @param {wp.media.model.Attachment} attachment * @param {wp.media.model.Attachment} attachment
* @returns {Boolean} * @returns {Boolean}
*/ */
@ -637,6 +666,8 @@ window.wp = window.wp || {};
}, this ); }, this );
}, },
/** /**
* Add or remove an attachment to the collection depending on its validity.
*
* @param {wp.media.model.Attachment} attachment * @param {wp.media.model.Attachment} attachment
* @param {Object} options * @param {Object} options
* @returns {wp.media.model.Attachments} Returns itself to allow chaining * @returns {wp.media.model.Attachments} Returns itself to allow chaining
@ -655,6 +686,8 @@ window.wp = window.wp || {};
}, },
/** /**
* Add or remove all attachments from another collection depending on each one's validity.
*
* @param {wp.media.model.Attachments} attachments * @param {wp.media.model.Attachments} attachments
* @param {object} [options={}] * @param {object} [options={}]
* *
@ -675,8 +708,11 @@ window.wp = window.wp || {};
return this; return this;
}, },
/** /**
* @param {wp.media.model.Attachments} attachments * Start observing another attachments collection change events
* @returns {wp.media.model.Attachments} Returns itself to allow chaining * and replicate them on this collection.
*
* @param {wp.media.model.Attachments} The attachments collection to observe.
* @returns {wp.media.model.Attachments} Returns itself to allow chaining.
*/ */
observe: function( attachments ) { observe: function( attachments ) {
this.observers = this.observers || []; this.observers = this.observers || [];
@ -688,7 +724,9 @@ window.wp = window.wp || {};
return this; return this;
}, },
/** /**
* @param {wp.media.model.Attachments} attachments * Stop replicating collection change events from another attachments collection.
*
* @param {wp.media.model.Attachments} The attachments collection to stop observing.
* @returns {wp.media.model.Attachments} Returns itself to allow chaining * @returns {wp.media.model.Attachments} Returns itself to allow chaining
*/ */
unobserve: function( attachments ) { unobserve: function( attachments ) {
@ -734,7 +772,10 @@ window.wp = window.wp || {};
return this.validateAll( attachments, options ); return this.validateAll( attachments, options );
}, },
/** /**
* @param {wp.media.model.Attachments} attachments * Start mirroring another attachments collection, clearing out any models already
* in the collection.
*
* @param {wp.media.model.Attachments} The attachments collection to mirror.
* @returns {wp.media.model.Attachments} Returns itself to allow chaining * @returns {wp.media.model.Attachments} Returns itself to allow chaining
*/ */
mirror: function( attachments ) { mirror: function( attachments ) {
@ -752,6 +793,9 @@ window.wp = window.wp || {};
return this; return this;
}, },
/**
* Stop mirroring another attachments collection.
*/
unmirror: function() { unmirror: function() {
if ( ! this.mirroring ) { if ( ! this.mirroring ) {
return; return;
@ -761,7 +805,13 @@ window.wp = window.wp || {};
delete this.mirroring; delete this.mirroring;
}, },
/** /**
* @param {Object} options * Retrive more attachments from the server for the collection.
*
* Only works if the collection is mirroring a Query Attachments collection,
* and forwards to its `more` method. This collection class doesn't have
* server persistence by itself.
*
* @param {object} options
* @returns {Promise} * @returns {Promise}
*/ */
more: function( options ) { more: function( options ) {
@ -784,13 +834,22 @@ window.wp = window.wp || {};
return deferred.promise(); return deferred.promise();
}, },
/** /**
* @returns {Boolean} * Whether there are more attachments that haven't been sync'd from the server
* that match the collection's query.
*
* Only works if the collection is mirroring a Query Attachments collection,
* and forwards to its `hasMore` method. This collection class doesn't have
* server persistence by itself.
*
* @returns {boolean}
*/ */
hasMore: function() { hasMore: function() {
return this.mirroring ? this.mirroring.hasMore() : false; return this.mirroring ? this.mirroring.hasMore() : false;
}, },
/** /**
* Overrides Backbone.Collection.parse * A custom AJAX-response parser.
*
* See trac ticket #24753
* *
* @param {Object|Array} resp The raw response Object/Array. * @param {Object|Array} resp The raw response Object/Array.
* @param {Object} xhr * @param {Object} xhr
@ -822,6 +881,8 @@ window.wp = window.wp || {};
}); });
}, },
/** /**
* If the collection is a query, create and mirror an Attachments Query collection.
*
* @access private * @access private
*/ */
_requery: function( refresh ) { _requery: function( refresh ) {
@ -867,8 +928,12 @@ window.wp = window.wp || {};
} }
}, { }, {
/** /**
* A function to compare two attachment models in an attachments collection.
*
* Used as the default comparator for instances of wp.media.model.Attachments
* and its subclasses. @see wp.media.model.Attachments._changeOrderby().
*
* @static * @static
* Overrides Backbone.Collection.comparator
* *
* @param {Backbone.Model} a * @param {Backbone.Model} a
* @param {Backbone.Model} b * @param {Backbone.Model} b
@ -971,6 +1036,8 @@ window.wp = window.wp || {};
}); });
/** /**
* A collection of all attachments that have been fetched from the server.
*
* @static * @static
* @member {wp.media.model.Attachments} * @member {wp.media.model.Attachments}
*/ */
@ -979,7 +1046,9 @@ window.wp = window.wp || {};
/** /**
* wp.media.query * wp.media.query
* *
* @static * Shorthand for creating a new Attachments Query.
*
* @param {object} [props]
* @returns {wp.media.model.Attachments} * @returns {wp.media.model.Attachments}
*/ */
media.query = function( props ) { media.query = function( props ) {
@ -991,22 +1060,26 @@ window.wp = window.wp || {};
/** /**
* wp.media.model.Query * wp.media.model.Query
* *
* A set of attachments that corresponds to a set of consecutively paged * A collection of attachments that match the supplied query arguments.
* queries on the server.
* *
* Note: Do NOT change this.args after the query has been initialized. * Note: Do NOT change this.args after the query has been initialized.
* Things will break. * Things will break.
* *
* @constructor * @class
* @augments wp.media.model.Attachments * @augments wp.media.model.Attachments
* @augments Backbone.Collection * @augments Backbone.Collection
*
* @param {array} [models] Models to initialize with the collection.
* @param {object} [options] Options hash.
* @param {object} [options.args] Attachments query arguments.
* @param {object} [options.args.posts_per_page]
*/ */
Query = media.model.Query = Attachments.extend({ Query = media.model.Query = Attachments.extend({
/** /**
* @global wp.Uploader * @global wp.Uploader
* *
* @param {Array} [models=[]] Array of models used to populate the collection. * @param {array} [models=[]] Array of initial models to populate the collection.
* @param {Object} [options={}] * @param {object} [options={}]
*/ */
initialize: function( models, options ) { initialize: function( models, options ) {
var allowed; var allowed;
@ -1060,18 +1133,24 @@ window.wp = window.wp || {};
} }
}, },
/** /**
* @returns {Boolean} * Whether there are more attachments that haven't been sync'd from the server
* that match the collection's query.
*
* @returns {boolean}
*/ */
hasMore: function() { hasMore: function() {
return this._hasMore; return this._hasMore;
}, },
/** /**
* @param {Object} [options={}] * Fetch more attachments from the server for the collection.
*
* @param {object} [options={}]
* @returns {Promise} * @returns {Promise}
*/ */
more: function( options ) { more: function( options ) {
var query = this; var query = this;
// If there is already a request pending, return early with the Deferred object.
if ( this._more && 'pending' === this._more.state() ) { if ( this._more && 'pending' === this._more.state() ) {
return this._more; return this._more;
} }
@ -1149,6 +1228,10 @@ window.wp = window.wp || {};
*/ */
orderby: { orderby: {
allowed: [ 'name', 'author', 'date', 'title', 'modified', 'uploadedTo', 'id', 'post__in', 'menuOrder' ], allowed: [ 'name', 'author', 'date', 'title', 'modified', 'uploadedTo', 'id', 'post__in', 'menuOrder' ],
/**
* A map of JavaScript orderby values to their WP_Query equivalents.
* @type {Object}
*/
valuemap: { valuemap: {
'id': 'ID', 'id': 'ID',
'uploadedTo': 'parent', 'uploadedTo': 'parent',
@ -1156,6 +1239,8 @@ window.wp = window.wp || {};
} }
}, },
/** /**
* A map of JavaScript query properties to their WP_Query equivalents.
*
* @readonly * @readonly
*/ */
propmap: { propmap: {
@ -1169,12 +1254,29 @@ window.wp = window.wp || {};
'exclude': 'post__not_in' 'exclude': 'post__not_in'
}, },
/** /**
* Creates and returns an Attachments Query collection given the properties.
*
* Caches query objects and reuses where possible.
*
* @static * @static
* @method * @method
* *
* @returns {wp.media.model.Query} A new query. * @param {object} [props]
* @param {Object} [props.cache=true] Whether to use the query cache or not.
* @param {Object} [props.order]
* @param {Object} [props.orderby]
* @param {Object} [props.include]
* @param {Object} [props.exclude]
* @param {Object} [props.s]
* @param {Object} [props.post_mime_type]
* @param {Object} [props.posts_per_page]
* @param {Object} [props.menu_order]
* @param {Object} [props.post_parent]
* @param {Object} [props.post_status]
* @param {Object} [options]
*
* @returns {wp.media.model.Query} A new Attachments Query collection.
*/ */
// Caches query objects so queries can be easily reused.
get: (function(){ get: (function(){
/** /**
* @static * @static
@ -1183,8 +1285,6 @@ window.wp = window.wp || {};
var queries = []; var queries = [];
/** /**
* @param {Object} props
* @param {Object} options
* @returns {Query} * @returns {Query}
*/ */
return function( props, options ) { return function( props, options ) {
@ -1236,7 +1336,7 @@ window.wp = window.wp || {};
// Substitute exceptions specified in orderby.keymap. // Substitute exceptions specified in orderby.keymap.
args.orderby = orderby.valuemap[ props.orderby ] || props.orderby; args.orderby = orderby.valuemap[ props.orderby ] || props.orderby;
// Search the query cache for matches. // Search the query cache for a matching query.
if ( cache ) { if ( cache ) {
query = _.find( queries, function( query ) { query = _.find( queries, function( query ) {
return _.isEqual( query.args, args ); return _.isEqual( query.args, args );
@ -1262,9 +1362,9 @@ window.wp = window.wp || {};
/** /**
* wp.media.model.Selection * wp.media.model.Selection
* *
* Used to manage a selection of attachments in the views. * A selection of attachments.
* *
* @constructor * @class
* @augments wp.media.model.Attachments * @augments wp.media.model.Attachments
* @augments Backbone.Collection * @augments Backbone.Collection
*/ */
@ -1288,12 +1388,8 @@ window.wp = window.wp || {};
}, },
/** /**
* Override the selection's add method. * If the workflow does not support multi-select, clear out the selection
* If the workflow does not support multiple * before adding a new attachment to it.
* selected attachments, reset the selection.
*
* Overrides Backbone.Collection.add
* Overrides wp.media.model.Attachments.add
* *
* @param {Array} models * @param {Array} models
* @param {Object} options * @param {Object} options
@ -1310,7 +1406,7 @@ window.wp = window.wp || {};
}, },
/** /**
* Triggered when toggling (clicking on) an attachment in the modal * Fired when toggling (clicking on) an attachment in the modal.
* *
* @param {undefined|boolean|wp.media.model.Attachment} model * @param {undefined|boolean|wp.media.model.Attachment} model
* *

92
wp-includes/js/media-views.js
View File

@ -679,25 +679,29 @@
* @augments Backbone.Model * @augments Backbone.Model
* @mixes media.selectionSync * @mixes media.selectionSync
* *
* @param {object} [attributes] The attributes hash passed to the state. * @param {object} [attributes] The attributes hash passed to the state.
* @param {string} [attributes.id=library] Unique identifier. * @param {string} [attributes.id=library] Unique identifier.
* @param {string} [attributes.title=Media library] Title for the state. Displays in the media menu and the frame's title region. * @param {string} [attributes.title=Media library] Title for the state. Displays in the media menu and the frame's title region.
* @param {wp.media.model.Attachments} [attributes.library] The attachments collection to browse. * @param {wp.media.model.Attachments} [attributes.library] The attachments collection to browse.
* If one is not supplied, a collection of all attachments will be created. * If one is not supplied, a collection of all attachments will be created.
* @param {boolean} [attributes.multiple=false] Whether multi-select is enabled. * @param {wp.media.model.Selection|object} [attributes.selection] A collection to contain attachment selections within the state.
* @param {string} [attributes.content=upload] Initial mode for the content region. * If the 'selection' attribute is a plain JS object,
* Overridden by persistent user setting if 'contentUserSetting' is true. * a Selection will be created using its values as the selection instance's `props` model.
* @param {string} [attributes.menu=default] Initial mode for the menu region. * Otherwise, it will copy the library's `props` model.
* @param {string} [attributes.router=browse] Initial mode for the router region. * @param {boolean} [attributes.multiple=false] Whether multi-select is enabled.
* @param {string} [attributes.toolbar=select] Initial mode for the toolbar region. * @param {string} [attributes.content=upload] Initial mode for the content region.
* @param {boolean} [attributes.searchable=true] Whether the library is searchable. * Overridden by persistent user setting if 'contentUserSetting' is true.
* @param {boolean|string} [attributes.filterable=false] Whether the library is filterable, and if so what filters should be shown. * @param {string} [attributes.menu=default] Initial mode for the menu region.
* Accepts 'all', 'uploaded', or 'unattached'. * @param {string} [attributes.router=browse] Initial mode for the router region.
* @param {boolean} [attributes.sortable=true] Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection. * @param {string} [attributes.toolbar=select] Initial mode for the toolbar region.
* @param {boolean} [attributes.autoSelect=true] Whether an uploaded attachment should be automatically added to the selection. * @param {boolean} [attributes.searchable=true] Whether the library is searchable.
* @param {boolean} [attributes.describe=false] Whether to offer UI to describe attachments - e.g. captioning images in a gallery. * @param {boolean|string} [attributes.filterable=false] Whether the library is filterable, and if so what filters should be shown.
* @param {boolean} [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user. * Accepts 'all', 'uploaded', or 'unattached'.
* @param {boolean} [attributes.syncSelection=true] Whether the Attachments selection should be persisted from the last state. * @param {boolean} [attributes.sortable=true] Whether the Attachments should be sortable. Depends on the orderby property being set to menuOrder on the attachments collection.
* @param {boolean} [attributes.autoSelect=true] Whether an uploaded attachment should be automatically added to the selection.
* @param {boolean} [attributes.describe=false] Whether to offer UI to describe attachments - e.g. captioning images in a gallery.
* @param {boolean} [attributes.contentUserSetting=true] Whether the content region's mode should be set and persisted per user.
* @param {boolean} [attributes.syncSelection=true] Whether the Attachments selection should be persisted from the last state.
*/ */
media.controller.Library = media.controller.State.extend({ media.controller.Library = media.controller.State.extend({
defaults: { defaults: {
@ -739,10 +743,6 @@
props = _.omit( props, 'orderby', 'query' ); props = _.omit( props, 'orderby', 'query' );
} }
// If the `selection` attribute is set to an object,
// it will use those values as the selection instance's
// `props` model. Otherwise, it will copy the library's
// `props` model.
this.set( 'selection', new media.model.Selection( null, { this.set( 'selection', new media.model.Selection( null, {
multiple: this.get('multiple'), multiple: this.get('multiple'),
props: props props: props
@ -2482,9 +2482,7 @@
*/ */
media.view.MediaFrame.Select = media.view.MediaFrame.extend({ media.view.MediaFrame.Select = media.view.MediaFrame.extend({
initialize: function() { initialize: function() {
/** // Call 'initialize' directly on the parent class.
* call 'initialize' directly on the parent class
*/
media.view.MediaFrame.prototype.initialize.apply( this, arguments ); media.view.MediaFrame.prototype.initialize.apply( this, arguments );
_.defaults( this.options, { _.defaults( this.options, {
@ -2664,9 +2662,8 @@
state: 'insert', state: 'insert',
metadata: {} metadata: {}
}); });
/**
* call 'initialize' directly on the parent class // Call 'initialize' directly on the parent class.
*/
media.view.MediaFrame.Select.prototype.initialize.apply( this, arguments ); media.view.MediaFrame.Select.prototype.initialize.apply( this, arguments );
this.createIframeStates(); this.createIframeStates();
@ -4553,9 +4550,7 @@
requires: options.requires requires: options.requires
} }
}); });
/** // Call 'initialize' directly on the parent class.
* call 'initialize' directly on the parent class
*/
media.view.Toolbar.prototype.initialize.apply( this, arguments ); media.view.Toolbar.prototype.initialize.apply( this, arguments );
}, },
@ -4597,9 +4592,7 @@
text: l10n.insertIntoPost, text: l10n.insertIntoPost,
requires: false requires: false
}); });
/** // Call 'initialize' directly on the parent class.
* call 'initialize' directly on the parent class
*/
media.view.Toolbar.Select.prototype.initialize.apply( this, arguments ); media.view.Toolbar.Select.prototype.initialize.apply( this, arguments );
}, },
@ -5046,9 +5039,7 @@
initialize: function() { initialize: function() {
this.controller.on( 'content:render', this.update, this ); this.controller.on( 'content:render', this.update, this );
/** // Call 'initialize' directly on the parent class.
* call 'initialize' directly on the parent class
*/
media.view.Menu.prototype.initialize.apply( this, arguments ); media.view.Menu.prototype.initialize.apply( this, arguments );
}, },
@ -6013,8 +6004,7 @@
}, },
/** /**
* When the selection changes, set the Query properties * When the selected filter changes, update the Attachment Query properties to match.
* accordingly for the selected filter.
*/ */
change: function() { change: function() {
var filter = this.filters[ this.el.value ]; var filter = this.filters[ this.el.value ];
@ -6221,6 +6211,16 @@
* @augments wp.media.View * @augments wp.media.View
* @augments wp.Backbone.View * @augments wp.Backbone.View
* @augments Backbone.View * @augments Backbone.View
*
* @param {object} options
* @param {object} [options.filters=false] Which filters to show in the browser's toolbar.
* Accepts 'uploaded' and 'all'.
* @param {object} [options.search=true] Whether to show the search interface in the
* browser's toolbar.
* @param {object} [options.display=false] Whether to show the attachments display settings
* view in the sidebar.
* @param {bool|string} [options.sidebar=true] Whether to create a sidebar for the browser.
* Accepts true, false, and 'errors'.
*/ */
media.view.AttachmentsBrowser = media.View.extend({ media.view.AttachmentsBrowser = media.View.extend({
tagName: 'div', tagName: 'div',
@ -6747,9 +6747,7 @@
// The single `Attachment` view to be used in the `Attachments` view. // The single `Attachment` view to be used in the `Attachments` view.
AttachmentView: media.view.Attachment.Selection AttachmentView: media.view.Attachment.Selection
}); });
/** // Call 'initialize' directly on the parent class.
* call 'initialize' directly on the parent class
*/
return media.view.Attachments.prototype.initialize.apply( this, arguments ); return media.view.Attachments.prototype.initialize.apply( this, arguments );
} }
}); });
@ -6904,9 +6902,7 @@
_.defaults( this.options, { _.defaults( this.options, {
userSettings: false userSettings: false
}); });
/** // Call 'initialize' directly on the parent class.
* call 'initialize' directly on the parent class
*/
media.view.Settings.prototype.initialize.apply( this, arguments ); media.view.Settings.prototype.initialize.apply( this, arguments );
this.model.on( 'change:link', this.updateLinkTo, this ); this.model.on( 'change:link', this.updateLinkTo, this );
@ -7036,9 +7032,7 @@
}); });
this.on( 'ready', this.initialFocus ); this.on( 'ready', this.initialFocus );
/** // Call 'initialize' directly on the parent class.
* call 'initialize' directly on the parent class
*/
media.view.Attachment.prototype.initialize.apply( this, arguments ); media.view.Attachment.prototype.initialize.apply( this, arguments );
}, },

8
wp-includes/js/wp-util.js
View File

@ -8,7 +8,7 @@ window.wp = window.wp || {};
/** /**
* wp.template( id ) * wp.template( id )
* *
* Fetches a template by id. * Fetch a JavaScript template for an id, and return a templating function for it.
* *
* @param {string} id A string that corresponds to a DOM element with an id prefixed with "tmpl-". * @param {string} id A string that corresponds to a DOM element with an id prefixed with "tmpl-".
* For example, "attachment" maps to "tmpl-attachment". * For example, "attachment" maps to "tmpl-attachment".
@ -16,6 +16,12 @@ window.wp = window.wp || {};
*/ */
wp.template = _.memoize(function ( id ) { wp.template = _.memoize(function ( id ) {
var compiled, var compiled,
/*
* Underscore's default ERB-style templates are incompatible with PHP
* when asp_tags is enabled, so WordPress uses Mustache-inspired templating syntax.
*
* @see trac ticket #22344.
*/
options = { options = {
evaluate: /<#([\s\S]+?)#>/g, evaluate: /<#([\s\S]+?)#>/g,
interpolate: /\{\{\{([\s\S]+?)\}\}\}/g, interpolate: /\{\{\{([\s\S]+?)\}\}\}/g,

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-alpha-30244'; $wp_version = '4.1-alpha-30245';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.