Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-26 23:04:57 +02:00
Code Issues Projects Releases Wiki Activity

Make sure the grid build does not load files from the views build.

Browse Source 
Fix the errant back-compat assignment for `wp.media.view.Frame`.

See #28510.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31475 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-02-22 08:47:25 +00:00
parent 7b8cdd61fd
commit d5b80a2be2
14 changed files with 56 additions and 5045 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/js/media/controllers/edit-attachment-metadata.js
View File

@ -9,7 +9,7 @@
* @augments wp.media.controller.State
* @augments Backbone.Model
*/
var State = require( './state.js' ),
var State = wp.media.controller.State,
l10n = wp.media.view.l10n,
EditAttachmentMetadata;

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

File diff suppressed because it is too large Load Diff

4
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/views.js
View File

@ -2181,7 +2181,7 @@ media.controller.Embed = require( './controllers/embed.js' );
media.controller.Cropper = require( './controllers/cropper.js' );
media.View = require( './views/view.js' );
media.view.Frame = require( './views/view.js' );
media.view.Frame = require( './views/frame.js' );
media.view.MediaFrame = require( './views/media-frame.js' );
media.view.MediaFrame.Select = require( './views/frame/select.js' );
media.view.MediaFrame.Post = require( './views/frame/post.js' );
@ -2235,7 +2235,7 @@ media.view.Cropper = require( './views/cropper.js' );
media.view.EditImage = require( './views/edit-image.js' );
media.view.Spinner = require( './views/spinner.js' );
},{"./controllers/collection-add.js":1,"./controllers/collection-edit.js":2,"./controllers/cropper.js":3,"./controllers/edit-image.js":4,"./controllers/embed.js":5,"./controllers/featured-image.js":6,"./controllers/gallery-add.js":7,"./controllers/gallery-edit.js":8,"./controllers/image-details.js":9,"./controllers/library.js":10,"./controllers/media-library.js":11,"./controllers/region.js":12,"./controllers/replace-image.js":13,"./controllers/state-machine.js":14,"./controllers/state.js":15,"./utils/selection-sync.js":16,"./views/attachment-compat.js":18,"./views/attachment-filters.js":19,"./views/attachment-filters/all.js":20,"./views/attachment-filters/date.js":21,"./views/attachment-filters/uploaded.js":22,"./views/attachment.js":23,"./views/attachment/details.js":24,"./views/attachment/edit-library.js":25,"./views/attachment/edit-selection.js":26,"./views/attachment/library.js":27,"./views/attachment/selection.js":28,"./views/attachments.js":29,"./views/attachments/browser.js":30,"./views/attachments/selection.js":31,"./views/button-group.js":32,"./views/button.js":33,"./views/cropper.js":34,"./views/edit-image.js":35,"./views/embed.js":36,"./views/embed/image.js":37,"./views/embed/link.js":38,"./views/embed/url.js":39,"./views/focus-manager.js":40,"./views/frame/image-details.js":42,"./views/frame/post.js":43,"./views/frame/select.js":44,"./views/iframe.js":45,"./views/image-details.js":46,"./views/label.js":47,"./views/media-frame.js":48,"./views/menu-item.js":49,"./views/menu.js":50,"./views/modal.js":51,"./views/priority-list.js":52,"./views/router-item.js":53,"./views/router.js":54,"./views/search.js":55,"./views/selection.js":56,"./views/settings.js":57,"./views/settings/attachment-display.js":58,"./views/settings/gallery.js":59,"./views/settings/playlist.js":60,"./views/sidebar.js":61,"./views/spinner.js":62,"./views/toolbar.js":63,"./views/toolbar/embed.js":64,"./views/toolbar/select.js":65,"./views/uploader/editor.js":66,"./views/uploader/inline.js":67,"./views/uploader/status-error.js":68,"./views/uploader/status.js":69,"./views/uploader/window.js":70,"./views/view.js":71}],18:[function(require,module,exports){
},{"./controllers/collection-add.js":1,"./controllers/collection-edit.js":2,"./controllers/cropper.js":3,"./controllers/edit-image.js":4,"./controllers/embed.js":5,"./controllers/featured-image.js":6,"./controllers/gallery-add.js":7,"./controllers/gallery-edit.js":8,"./controllers/image-details.js":9,"./controllers/library.js":10,"./controllers/media-library.js":11,"./controllers/region.js":12,"./controllers/replace-image.js":13,"./controllers/state-machine.js":14,"./controllers/state.js":15,"./utils/selection-sync.js":16,"./views/attachment-compat.js":18,"./views/attachment-filters.js":19,"./views/attachment-filters/all.js":20,"./views/attachment-filters/date.js":21,"./views/attachment-filters/uploaded.js":22,"./views/attachment.js":23,"./views/attachment/details.js":24,"./views/attachment/edit-library.js":25,"./views/attachment/edit-selection.js":26,"./views/attachment/library.js":27,"./views/attachment/selection.js":28,"./views/attachments.js":29,"./views/attachments/browser.js":30,"./views/attachments/selection.js":31,"./views/button-group.js":32,"./views/button.js":33,"./views/cropper.js":34,"./views/edit-image.js":35,"./views/embed.js":36,"./views/embed/image.js":37,"./views/embed/link.js":38,"./views/embed/url.js":39,"./views/focus-manager.js":40,"./views/frame.js":41,"./views/frame/image-details.js":42,"./views/frame/post.js":43,"./views/frame/select.js":44,"./views/iframe.js":45,"./views/image-details.js":46,"./views/label.js":47,"./views/media-frame.js":48,"./views/menu-item.js":49,"./views/menu.js":50,"./views/modal.js":51,"./views/priority-list.js":52,"./views/router-item.js":53,"./views/router.js":54,"./views/search.js":55,"./views/selection.js":56,"./views/settings.js":57,"./views/settings/attachment-display.js":58,"./views/settings/gallery.js":59,"./views/settings/playlist.js":60,"./views/sidebar.js":61,"./views/spinner.js":62,"./views/toolbar.js":63,"./views/toolbar/embed.js":64,"./views/toolbar/select.js":65,"./views/uploader/editor.js":66,"./views/uploader/inline.js":67,"./views/uploader/status-error.js":68,"./views/uploader/status.js":69,"./views/uploader/window.js":70,"./views/view.js":71}],18:[function(require,module,exports){
/*globals _ */
/**

2
wp-includes/js/media/views.manifest.js
View File

@ -92,7 +92,7 @@ media.controller.Embed = require( './controllers/embed.js' );
media.controller.Cropper = require( './controllers/cropper.js' );
media.View = require( './views/view.js' );
media.view.Frame = require( './views/view.js' );
media.view.Frame = require( './views/frame.js' );
media.view.MediaFrame = require( './views/media-frame.js' );
media.view.MediaFrame.Select = require( './views/frame/select.js' );
media.view.MediaFrame.Post = require( './views/frame/post.js' );

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

File diff suppressed because one or more lines are too long

2
wp-includes/js/media/views/attachment/details-two-column.js
View File

@ -13,7 +13,7 @@
* @augments wp.Backbone.View
* @augments Backbone.View
*/
var Details = require( './details.js' ),
var Details = wp.media.view.Attachment.Details,
TwoColumn;
TwoColumn = Details.extend({

2
wp-includes/js/media/views/button/delete-selected-permanently.js
View File

@ -10,7 +10,7 @@
* @augments wp.Backbone.View
* @augments Backbone.View
*/
var Button = require( '../button.js' ),
var Button = wp.media.view.Button,
DeleteSelected = require( './delete-selected.js' ),
DeleteSelectedPermanently;

2
wp-includes/js/media/views/button/delete-selected.js
View File

@ -11,7 +11,7 @@
* @augments wp.Backbone.View
* @augments Backbone.View
*/
var Button = require( '../button.js' ),
var Button = wp.media.view.Button,
l10n = wp.media.view.l10n,
DeleteSelected;

2
wp-includes/js/media/views/button/select-mode-toggle.js
View File

@ -9,7 +9,7 @@
* @augments wp.Backbone.View
* @augments Backbone.View
*/
var Button = require( '../button.js' ),
var Button = wp.media.view.Button,
l10n = wp.media.view.l10n,
SelectModeToggle;

4
wp-includes/js/media/views/edit-image-details.js
View File

@ -4,12 +4,12 @@
* wp.media.view.EditImage.Details
*
* @class
* @augments wp.media.view.EditImage.Details
* @augments wp.media.view.EditImage
* @augments wp.media.View
* @augments wp.Backbone.View
* @augments Backbone.View
*/
var View = require( './view.js' ),
var View = wp.media.View,
EditImage = wp.media.view.EditImage,
Details;

12
wp-includes/js/media/views/frame/edit-attachments.js
View File

@ -16,14 +16,16 @@
* @augments Backbone.View
* @mixes wp.media.controller.StateMachine
*/
var Frame = require( '../frame.js' ),
MediaFrame = require( '../media-frame.js' ),
Modal = require( '../modal.js' ),
var Frame = wp.media.view.Frame,
MediaFrame = wp.media.view.MediaFrame,
Modal = wp.media.view.Modal,
AttachmentCompat = wp.media.view.AttachmentCompat,
EditImageController = wp.media.controller.EditImage,
EditAttachmentMetadata = require( '../../controllers/edit-attachment-metadata.js' ),
TwoColumn = require( '../attachment/details-two-column.js' ),
AttachmentCompat = require( '../attachment-compat.js' ),
EditImageController = require( '../../controllers/edit-image.js' ),
DetailsView = require( '../edit-image-details.js' ),
$ = jQuery,
EditAttachments;

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

@ -15,11 +15,13 @@
* @augments Backbone.View
* @mixes wp.media.controller.StateMachine
*/
var MediaFrame = require( '../media-frame.js' ),
UploaderWindow = require( '../uploader/window.js' ),
AttachmentsBrowser = require( '../attachments/browser.js' ),
var MediaFrame = wp.media.view.MediaFrame,
UploaderWindow = wp.media.view.UploaderWindow,
AttachmentsBrowser = wp.media.view.AttachmentsBrowser,
Library = wp.media.controller.Library,
Router = require( '../../routers/manage.js' ),
Library = require( '../../controllers/library.js' ),
$ = jQuery,
Manage;

2
wp-includes/version.php
View File

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