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

Backbone 1.0.0. 

Update media JS to reflect changes. Please open new tickets for remaining issues.

props koopersmith.
fixes #23830.



git-svn-id: http://core.svn.wordpress.org/trunk@23893 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-04-03 17:40:52 +00:00
parent 163ebbe809
commit ec0e3724e1
3 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
wp-includes/js/backbone.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -75,13 +75,13 @@ window.wp = window.wp || {};
options.success = function( resp ) {
if ( success )
success( model, resp, options );
success( resp );
model.trigger( 'sync', model, resp, options );
};
options.error = function( xhr ) {
if ( error )
error( model, xhr, options );
error( xhr );
model.trigger( 'error', model, xhr, options );
};
@ -745,7 +745,7 @@ window.wp = window.wp || {};
return $.Deferred().resolveWith( this ).promise();
options = options || {};
options.add = true;
options.remove = false;
return this._more = this.fetch( options ).done( function( resp ) {
if ( _.isEmpty( resp ) || -1 === this.args.posts_per_page || resp.length < this.args.posts_per_page )

2
wp-includes/script-loader.php
View File

@ -276,7 +276,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'underscore', '/wp-includes/js/underscore.min.js', array(), '1.4.4', 1 );
$scripts->add( 'template', "/wp-includes/js/template$suffix.js", array('underscore'), '1.4.4', 1 );
$scripts->add( 'backbone', '/wp-includes/js/backbone.min.js', array('underscore','jquery', 'template'), '0.9.10', 1 );
$scripts->add( 'backbone', '/wp-includes/js/backbone.min.js', array('underscore','jquery', 'template'), '1.0.0', 1 );
$scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'backbone', 'jquery-ui-slider', 'jquery-ui-tooltip' ), false, 1 );