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

Make sure the audio-video build does not load files from the views build.

Browse Source 
See #28510.

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


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

5258
wp-includes/js/media/audio-video.js
View File

File diff suppressed because it is too large Load Diff

4
wp-includes/js/media/audio-video.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/js/media/controllers/audio-details.js
View File

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

2
wp-includes/js/media/controllers/video-details.js
View File

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

5
wp-includes/js/media/views/frame/audio-details.js
View File

@ -13,8 +13,9 @@
* @augments Backbone.View * @augments Backbone.View
* @mixes wp.media.controller.StateMachine * @mixes wp.media.controller.StateMachine
*/ */
var MediaDetails = require( './media-details' ), var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
MediaLibrary = require( '../../controllers/media-library.js' ), MediaLibrary = wp.media.controller.MediaLibrary,
AudioDetailsView = require( '../audio-details.js' ), AudioDetailsView = require( '../audio-details.js' ),
AudioDetailsController = require( '../../controllers/audio-details.js' ), AudioDetailsController = require( '../../controllers/audio-details.js' ),
l10n = wp.media.view.l10n, l10n = wp.media.view.l10n,

6
wp-includes/js/media/views/frame/media-details.js
View File

@ -12,9 +12,9 @@
* @augments Backbone.View * @augments Backbone.View
* @mixes wp.media.controller.StateMachine * @mixes wp.media.controller.StateMachine
*/ */
var View = require( '../view.js' ), var View = wp.media.View,
Toolbar = require( '../toolbar.js' ), Toolbar = wp.media.view.Toolbar,
Select = require( './select.js' ), Select = wp.media.view.MediaFrame.Select,
l10n = wp.media.view.l10n, l10n = wp.media.view.l10n,
MediaDetails; MediaDetails;

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

@ -13,8 +13,8 @@
* @augments Backbone.View * @augments Backbone.View
* @mixes wp.media.controller.StateMachine * @mixes wp.media.controller.StateMachine
*/ */
var MediaDetails = require( './media-details' ), var MediaDetails = wp.media.view.MediaFrame.MediaDetails,
MediaLibrary = require( '../../controllers/media-library.js' ), MediaLibrary = wp.media.controller.MediaLibrary,
VideoDetailsView = require( '../video-details.js' ), VideoDetailsView = require( '../video-details.js' ),
VideoDetailsController = require( '../../controllers/video-details.js' ), VideoDetailsController = require( '../../controllers/video-details.js' ),
l10n = wp.media.view.l10n, l10n = wp.media.view.l10n,

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

@ -10,7 +10,7 @@
* @augments wp.Backbone.View * @augments wp.Backbone.View
* @augments Backbone.View * @augments Backbone.View
*/ */
var AttachmentDisplay = require( './settings/attachment-display.js' ), var AttachmentDisplay = wp.media.view.Settings.AttachmentDisplay,
$ = jQuery, $ = jQuery,
MediaDetails; MediaDetails;
@ -93,7 +93,7 @@ MediaDetails = AttachmentDisplay.extend({
return; return;
} }
if ( this.media.src.indexOf( 'vimeo' ) && ! ( 'Froogaloop' in window ) ) { if ( this.media.src.indexOf( 'vimeo' ) > -1 && ! ( 'Froogaloop' in window ) ) {
baseSettings = wp.media.mixin.mejsSettings; baseSettings = wp.media.mixin.mejsSettings;
this.scriptXhr = $.getScript( baseSettings.pluginPath + 'froogaloop.min.js', _.bind( this.loadPlayer, this ) ); this.scriptXhr = $.getScript( baseSettings.pluginPath + 'froogaloop.min.js', _.bind( this.loadPlayer, this ) );
} else { } else {

2
wp-includes/version.php
View File

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