Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-25 10:38:11 +01:00
Code Issues Projects Releases Wiki Activity

Media modules: set $ to Backbone.$, instead of jQuery, so fewer globals are imported.

Browse Source 
See #28510.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31599 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-03-05 04:12:26 +00:00
parent 34715e3b1a
commit 0250aebf2a
12 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/js/media/controllers/embed.js
View File

@ -1,4 +1,4 @@
/*globals wp, _, Backbone, jQuery */ /*globals wp, _, Backbone */
/** /**
* wp.media.controller.Embed * wp.media.controller.Embed
@ -23,7 +23,7 @@
*/ */
var State = require( './state.js' ), var State = require( './state.js' ),
l10n = wp.media.view.l10n, l10n = wp.media.view.l10n,
$ = jQuery, $ = Backbone.$,
Embed; Embed;
Embed = State.extend({ Embed = State.extend({

4
wp-includes/js/media/grid.js
View File

@ -597,7 +597,7 @@ EditAttachments = MediaFrame.extend({
module.exports = EditAttachments; module.exports = EditAttachments;
},{"../../controllers/edit-attachment-metadata.js":1,"../attachment/details-two-column.js":4,"../edit-image-details.js":8}],10:[function(require,module,exports){ },{"../../controllers/edit-attachment-metadata.js":1,"../attachment/details-two-column.js":4,"../edit-image-details.js":8}],10:[function(require,module,exports){
/*globals wp, _, jQuery, Backbone */ /*globals wp, _, Backbone */
/** /**
* wp.media.view.MediaFrame.Manage * wp.media.view.MediaFrame.Manage
@ -621,7 +621,7 @@ var MediaFrame = wp.media.view.MediaFrame,
Router = require( '../../routers/manage.js' ), Router = require( '../../routers/manage.js' ),
$ = jQuery, $ = Backbone.$,
Manage; Manage;
Manage = MediaFrame.extend({ Manage = MediaFrame.extend({

2
wp-includes/js/media/grid.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -232,7 +232,7 @@ $(window).on('unload', function(){
}); });
},{"./models/attachment.js":2,"./models/attachments.js":3,"./models/post-image.js":4,"./models/query.js":5,"./models/selection.js":6}],2:[function(require,module,exports){ },{"./models/attachment.js":2,"./models/attachments.js":3,"./models/post-image.js":4,"./models/query.js":5,"./models/selection.js":6}],2:[function(require,module,exports){
/*globals wp, _, jQuery, Backbone */ /*globals wp, _, Backbone */
/** /**
* wp.media.model.Attachment * wp.media.model.Attachment
@ -240,7 +240,7 @@ $(window).on('unload', function(){
* @class * @class
* @augments Backbone.Model * @augments Backbone.Model
*/ */
var $ = jQuery, var $ = Backbone.$,
Attachment; Attachment;
Attachment = Backbone.Model.extend({ Attachment = Backbone.Model.extend({

2
wp-includes/js/media/models.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
wp-includes/js/media/models/attachment.js
View File

@ -1,4 +1,4 @@
/*globals wp, _, jQuery, Backbone */ /*globals wp, _, Backbone */
/** /**
* wp.media.model.Attachment * wp.media.model.Attachment
@ -6,7 +6,7 @@
* @class * @class
* @augments Backbone.Model * @augments Backbone.Model
*/ */
var $ = jQuery, var $ = Backbone.$,
Attachment; Attachment;
Attachment = Backbone.Model.extend({ Attachment = Backbone.Model.extend({

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

@ -467,7 +467,7 @@ EditImage = State.extend({
module.exports = EditImage; module.exports = EditImage;
},{"../views/toolbar.js":63,"./state.js":15}],5:[function(require,module,exports){ },{"../views/toolbar.js":63,"./state.js":15}],5:[function(require,module,exports){
/*globals wp, _, Backbone, jQuery */ /*globals wp, _, Backbone */
/** /**
* wp.media.controller.Embed * wp.media.controller.Embed
@ -492,7 +492,7 @@ module.exports = EditImage;
*/ */
var State = require( './state.js' ), var State = require( './state.js' ),
l10n = wp.media.view.l10n, l10n = wp.media.view.l10n,
$ = jQuery, $ = Backbone.$,
Embed; Embed;
Embed = State.extend({ Embed = State.extend({
@ -4185,7 +4185,7 @@ Selection = Attachments.extend({
module.exports = Selection; module.exports = Selection;
},{"../attachment/selection.js":28,"../attachments.js":29}],32:[function(require,module,exports){ },{"../attachment/selection.js":28,"../attachments.js":29}],32:[function(require,module,exports){
/*globals _, Backbone, jQuery */ /*globals _, Backbone */
/** /**
* wp.media.view.ButtonGroup * wp.media.view.ButtonGroup
@ -4197,7 +4197,7 @@ module.exports = Selection;
*/ */
var View = require( './view.js' ), var View = require( './view.js' ),
Button = require( './button.js' ), Button = require( './button.js' ),
$ = jQuery, $ = Backbone.$,
ButtonGroup; ButtonGroup;
ButtonGroup = View.extend({ ButtonGroup = View.extend({
@ -7242,7 +7242,7 @@ Selection = View.extend({
module.exports = Selection; module.exports = Selection;
},{"./attachments/selection.js":31,"./view.js":71}],57:[function(require,module,exports){ },{"./attachments/selection.js":31,"./view.js":71}],57:[function(require,module,exports){
/*globals _, jQuery, Backbone */ /*globals _, Backbone */
/** /**
* wp.media.view.Settings * wp.media.view.Settings
@ -7253,7 +7253,7 @@ module.exports = Selection;
* @augments Backbone.View * @augments Backbone.View
*/ */
var View = require( './view.js' ), var View = require( './view.js' ),
$ = jQuery, $ = Backbone.$,
Settings; Settings;
Settings = View.extend({ Settings = View.extend({

6
wp-includes/js/media/views.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
wp-includes/js/media/views/button-group.js
View File

@ -1,4 +1,4 @@
/*globals _, Backbone, jQuery */ /*globals _, Backbone */
/** /**
* wp.media.view.ButtonGroup * wp.media.view.ButtonGroup
@ -10,7 +10,7 @@
*/ */
var View = require( './view.js' ), var View = require( './view.js' ),
Button = require( './button.js' ), Button = require( './button.js' ),
$ = jQuery, $ = Backbone.$,
ButtonGroup; ButtonGroup;
ButtonGroup = View.extend({ ButtonGroup = View.extend({

4
wp-includes/js/media/views/frame/manage.js
View File

@ -1,4 +1,4 @@
/*globals wp, _, jQuery, Backbone */ /*globals wp, _, Backbone */
/** /**
* wp.media.view.MediaFrame.Manage * wp.media.view.MediaFrame.Manage
@ -22,7 +22,7 @@ var MediaFrame = wp.media.view.MediaFrame,
Router = require( '../../routers/manage.js' ), Router = require( '../../routers/manage.js' ),
$ = jQuery, $ = Backbone.$,
Manage; Manage;
Manage = MediaFrame.extend({ Manage = MediaFrame.extend({

4
wp-includes/js/media/views/settings.js
View File

@ -1,4 +1,4 @@
/*globals _, jQuery, Backbone */ /*globals _, Backbone */
/** /**
* wp.media.view.Settings * wp.media.view.Settings
@ -9,7 +9,7 @@
* @augments Backbone.View * @augments Backbone.View
*/ */
var View = require( './view.js' ), var View = require( './view.js' ),
$ = jQuery, $ = Backbone.$,
Settings; Settings;
Settings = View.extend({ Settings = View.extend({

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31617'; $wp_version = '4.2-alpha-31618';
/** /**
* 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.