vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-04 14:47:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert [27528] until Flash in Firefox behaves :(

Browse Source 
See #27389.



git-svn-id: https://develop.svn.wordpress.org/trunk@27530 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2014-03-13 23:38:14 +00:00
parent 163b0e2832
commit bb02b06ad4
8 changed files with 183 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-includes/js/mce-view.js
+6 -116
View File
@@ -1,4 +1,4 @@
/* global tinymce, _wpmejsSettings, MediaElementPlayer */
/* global tinymce */
// Ensure the global `wp` object exists.
window.wp = window.wp || {};
@@ -31,14 +31,10 @@ window.wp = window.wp || {};
var html = this.getHtml();
// Search all tinymce editor instances and update the placeholders
_.each( tinymce.editors, function( editor ) {
var doc, self = this;
var doc;
if ( editor.plugins.wpview ) {
doc = editor.getDoc();
$( doc ).find( '[data-wpview-text="' + this.encodedText + '"]' ).each(function (i, elem) {
var node = $( elem );
node.html( html );
$( self ).trigger( 'ready', elem );
});
$( doc ).find( '[data-wpview-text="' + this.encodedText + '"]' ).html( html );
}
}, this );
}
@@ -182,7 +178,7 @@ window.wp = window.wp || {};
/**
* Refresh views after an update is made
*
*
* @param view {object} being refreshed
* @param text {string} textual representation of the view
*/
@@ -208,9 +204,9 @@ window.wp = window.wp || {};
return instances[ encodedText ];
},
/**
/**
* render( scope )
*
*
* Renders any view instances inside a DOM node `scope`.
*
* View instances are detected by the presence of wrapper elements.
@@ -306,110 +302,4 @@ window.wp = window.wp || {};
};
wp.mce.views.register( 'gallery', wp.mce.gallery );
wp.mce.media = {
toView: function( content ) {
var match = wp.shortcode.next( this.shortcode, content );
if ( ! match ) {
return;
}
return {
index: match.index,
content: match.content,
options: {
shortcode: match.shortcode
}
};
},
edit: function( node ) {
var p,
media = wp.media[ this.shortcode ],
self = this,
frame, data;
for (p in window.mejs.players) {
window.mejs.players[p].pause();
}
data = window.decodeURIComponent( $( node ).data('wpview-text') );
frame = media.edit( data );
frame.on( 'close', function () {
frame.detach();
} );
frame.state( self.shortcode + '-details' ).on( 'update', function( selection ) {
var shortcode = wp.media[ self.shortcode ].update( selection ).string();
$( node ).attr( 'data-wpview-text', window.encodeURIComponent( shortcode ) );
wp.mce.views.refreshView( self, shortcode );
frame.detach();
} );
frame.open();
}
};
wp.mce.media.ViewMixin = wp.mce.View.extend({
initialize: function( options ) {
this.shortcode = options.shortcode;
_.bindAll( this, 'setPlayer' );
$(this).on( 'ready', this.setPlayer );
},
setPlayer: function (e, node) {
// if the ready event fires on an empty node
if ( ! node ) {
return;
}
var id,
media,
settings = {},
className = '.wp-' + this.shortcode.tag + '-shortcode';
media = $( node ).find( className );
if ( media.hasClass( 'rendered' ) ) {
id = media.closest( className ).attr( 'id' );
window.mejs.players[ id ].remove();
} else {
media.addClass( 'rendered' );
}
media.prop( 'preload', 'none' );
media = media.get(0);
if ( ! _.isUndefined( window._wpmejsSettings ) ) {
settings.pluginPath = _wpmejsSettings.pluginPath;
}
media = wp.media.view.MediaDetails.prepareSrc( media );
new MediaElementPlayer( media, settings );
},
getHtml: function() {
var attrs = this.shortcode.attrs.named;
return this.template({ model: attrs });
}
});
wp.mce.video = _.extend( {}, wp.mce.media, {
shortcode: 'video',
View: wp.mce.media.ViewMixin.extend({
className: 'editor-video',
template: media.template('editor-video')
})
} );
wp.mce.views.register( 'video', wp.mce.video );
wp.mce.audio = _.extend( {}, wp.mce.media, {
shortcode: 'audio',
View: wp.mce.media.ViewMixin.extend({
className: 'editor-audio',
template: media.template('editor-audio')
})
} );
wp.mce.views.register( 'audio', wp.mce.audio );
}(jQuery));
src/wp-includes/js/media-editor.js
+46 -61
View File
@@ -581,24 +581,20 @@
return frame;
},
update : function (model) {
var self = this, content;
shortcode : function (shortcode) {
var self = this;
_.each( this.defaults, function( value, key ) {
model[ key ] = self.coerce( model, key );
_.each( wp.media.audio.defaults, function( value, key ) {
shortcode[ key ] = self.coerce( shortcode, key );
if ( value === model[ key ] ) {
delete model[ key ];
if ( value === shortcode[ key ] ) {
delete shortcode[ key ];
}
});
content = model.content;
delete model.content;
return new wp.shortcode({
tag: 'audio',
attrs: model,
content: content
return wp.shortcode.string({
tag: 'audio',
attrs: shortcode
});
}
}, wp.media.mixin);
@@ -635,23 +631,21 @@
return frame;
},
update : function (model) {
var self = this, content = '';
shortcode : function (shortcode) {
var self = this, content = shortcode.content;
delete shortcode.content;
_.each( this.defaults, function( value, key ) {
model[ key ] = self.coerce( model, key );
shortcode[ key ] = self.coerce( shortcode, key );
if ( value === model[ key ] ) {
delete model[ key ];
if ( value === shortcode[ key ] ) {
delete shortcode[ key ];
}
});
content = model.content;
delete model.content;
return new wp.shortcode({
tag: 'video',
attrs: model,
return wp.shortcode.string({
tag: 'video',
attrs: shortcode,
content: content
});
}
@@ -1117,47 +1111,38 @@
* @global wp.media.view.l10n
*/
init: function() {
$(document.body)
.on( 'click', '.insert-media', function( event ) {
var elem = $( event.currentTarget ),
editor = elem.data('editor'),
options = {
frame: 'post',
state: 'insert',
title: wp.media.view.l10n.addMedia,
multiple: true
};
$(document.body).on( 'click', '.insert-media', function( event ) {
var elem = $( event.currentTarget ),
editor = elem.data('editor'),
options = {
frame: 'post',
state: 'insert',
title: wp.media.view.l10n.addMedia,
multiple: true
};
event.preventDefault();
event.preventDefault();
// Remove focus from the `.insert-media` button.
// Prevents Opera from showing the outline of the button
// above the modal.
//
// See: http://core.trac.wordpress.org/ticket/22445
elem.blur();
// Remove focus from the `.insert-media` button.
// Prevents Opera from showing the outline of the button
// above the modal.
//
// See: http://core.trac.wordpress.org/ticket/22445
elem.blur();
if ( elem.hasClass( 'gallery' ) ) {
options.state = 'gallery';
options.title = wp.media.view.l10n.createGalleryTitle;
} else if ( elem.hasClass( 'playlist' ) ) {
options.state = 'playlist';
options.title = wp.media.view.l10n.createPlaylistTitle;
} else if ( elem.hasClass( 'video-playlist' ) ) {
options.state = 'video-playlist';
options.title = wp.media.view.l10n.createVideoPlaylistTitle;
}
if ( elem.hasClass( 'gallery' ) ) {
options.state = 'gallery';
options.title = wp.media.view.l10n.createGalleryTitle;
} else if ( elem.hasClass( 'playlist' ) ) {
options.state = 'playlist';
options.title = wp.media.view.l10n.createPlaylistTitle;
} else if ( elem.hasClass( 'video-playlist' ) ) {
options.state = 'video-playlist';
options.title = wp.media.view.l10n.createVideoPlaylistTitle;
}
wp.media.editor.open( editor, options );
})
.on( 'click', '.wp-switch-editor', function () {
var p;
if ( window.mejs && window.mejs.players ) {
for ( p in window.mejs.players ) {
window.mejs.players[p].pause();
}
}
} );
wp.media.editor.open( editor, options );
});
// Initialize and render the Editor drag-and-drop uploader.
new wp.media.view.EditorUploader().render();
src/wp-includes/js/media-models.js
-1
View File
@@ -467,7 +467,6 @@ window.wp = window.wp || {};
this.attachment = attachment;
this.extension = attachment.get('filename' ).split('.').pop();
this.unset( 'src' );
if ( _.contains( wp.media.view.settings.embedExts, this.extension ) ) {
this.set( this.extension, this.attachment.get( 'url' ) );
} else {
src/wp-includes/js/media-views.js
+30 -51
View File
@@ -6542,6 +6542,26 @@
}, this.options );
},
/**
* When multiple players in the DOM contain the same src, things get weird.
*
* @param {HTMLElement} media
* @returns {HTMLElement}
*/
prepareSrc : function (media) {
var i = wp.media.view.MediaDetails.instances++;
_.each( $(media).find('source'), function (source) {
source.src = [
source.src,
source.src.indexOf('?') > -1 ? '&' : '?',
'_=',
i
].join('');
});
return media;
},
removeSetting : function (e) {
var wrap = $( e.currentTarget ).parent(), setting;
@@ -6613,10 +6633,9 @@
},
unsetPlayer : function() {
var p;
if ( this.player ) {
for ( p in window.mejs.players ) {
window.mejs.players[p].pause();
if ( _.isUndefined( this.mejs.pluginType ) ) {
this.mejs.pause();
}
this.removePlayer();
this.player = false;
@@ -6656,30 +6675,7 @@
this.$( '.embed-media-settings' ).scrollTop( 0 );
}
}, {
instances : 0,
/**
* When multiple players in the DOM contain the same src, things get weird.
*
* @param {HTMLElement} media
* @returns {HTMLElement}
*/
prepareSrc : function (media) {
var i = wp.media.view.MediaDetails.instances++;
if ( 0 === i ) {
i = (new Date()).getTime();
}
_.each( $(media).find('source'), function (source) {
source.src = [
source.src,
source.src.indexOf('?') > -1 ? '&' : '?',
'_=',
i
].join('');
});
return media;
}
instances : 0
});
/**
@@ -6698,23 +6694,13 @@
template: media.template('audio-details'),
setMedia: function() {
var className = '.wp-audio-shortcode',
audio;
audio = this.$( className );
var audio = this.$('.wp-audio-shortcode');
if ( audio.find( 'source' ).length ) {
if ( audio.is(':hidden') ) {
audio.show();
}
audio = audio.get(0);
if ( $( className ).length > 0 ) {
audio = media.view.MediaDetails.prepareSrc( audio );
}
this.media = audio;
this.media = this.prepareSrc( audio.get(0) );
} else {
audio.hide();
this.media = false;
@@ -6740,25 +6726,18 @@
template: media.template('video-details'),
setMedia: function() {
var className = '.wp-video-shortcode',
video,
yt;
video = this.$( className );
yt = video.hasClass('youtube-video');
var video = this.$('.wp-video-shortcode');
if ( video.find( 'source' ).length ) {
if ( video.is(':hidden') ) {
video.show();
}
video = video.get(0);
if ( ! yt ) {
video = media.view.MediaDetails.prepareSrc( video );
if ( ! video.hasClass('youtube-video') ) {
this.media = this.prepareSrc( video.get(0) );
} else {
this.media = video.get(0);
}
this.media = video;
} else {
video.hide();
this.media = false;
src/wp-includes/js/tinymce/plugins/wpgallery/plugin.js
+27 -2
View File
@@ -25,8 +25,8 @@ tinymce.PluginManager.add('wpgallery', function( editor ) {
}
function replaceAVShortcodes( content ) {
var testRegex = /\[(video-playlist|playlist)[^\]]*\]/,
replaceRegex = /\[(video-playlist|playlist)[^\]]*\]([\s\S]*?\[\/\1\])?/;
var testRegex = /\[(video-playlist|audio|video|playlist)[^\]]*\]/,
replaceRegex = /\[(video-playlist|audio|video|playlist)[^\]]*\]([\s\S]*?\[\/\1\])?/;
while ( testRegex.test( content ) ) {
content = content.replace( replaceRegex, replaceCallback );
@@ -92,6 +92,31 @@ tinymce.PluginManager.add('wpgallery', function( editor ) {
editor.dom.setAttrib( node, 'data-wp-media', window.encodeURIComponent( shortcode ) );
frame.detach();
});
} else if ( editor.dom.hasClass( node, 'wp-video' ) ) {
frame = wp.media.video.edit( data );
frame.on( 'close', function () {
frame.detach();
} );
frame.state( 'video-details' ).on(
'update replace add-source select-poster-image add-track',
function ( selection ) {
var shortcode = wp.media.video.shortcode( selection );
editor.dom.setAttrib( node, 'data-wp-media', window.encodeURIComponent( shortcode ) );
frame.detach();
}
);
frame.open();
} else if ( editor.dom.hasClass( node, 'wp-audio' ) ) {
frame = wp.media.audio.edit( data );
frame.on( 'close', function () {
frame.detach();
} );
frame.state( 'audio-details' ).on( 'update replace add-source', function ( selection ) {
var shortcode = wp.media.audio.shortcode( selection );
editor.dom.setAttrib( node, 'data-wp-media', window.encodeURIComponent( shortcode ) );
frame.detach();
} );
frame.open();
} else {
// temp
window.console && window.console.log( 'Edit AV shortcode ' + data );
src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
+5 -38
View File
@@ -237,32 +237,14 @@ img::selection {
/**
* Gallery preview
*/
.wpview-type-gallery,
.wpview-type-audio,
.wpview-type-video {
.wpview-type-gallery {
position: relative;
padding: 0 0 12px;
margin-bottom: 16px;
cursor: pointer;
}
.wpview-type-audio {
padding: 32px 0 0;
}
.wpview-type-video {
padding: 16px 0 0;
}
.wpview-type-audio audio,
.wpview-type-video video {
display: inline-block;
max-width: 100%;
}
.wpview-type-gallery:after,
.wpview-type-audio:after,
.wpview-type-video:after {
.wpview-type-gallery:after {
content: '';
display: block;
height: 0;
@@ -270,18 +252,11 @@ img::selection {
visibility: hidden;
}
.wpview-type-gallery.selected {
.wpview-type-gallery.selected {
background-color: #efefef;
}
.wpview-type-audio,
.wpview-type-video {
background-color: #efefef;
}
.wpview-type-gallery .toolbar,
.wpview-type-audio .toolbar,
.wpview-type-video .toolbar {
.wpview-type-gallery .toolbar {
position: absolute;
top: 0;
left: 0;
@@ -289,21 +264,13 @@ img::selection {
color: white;
padding: 4px;
display: none;
z-index: 100;
}
.wpview-type-audio .toolbar,
.wpview-type-video .toolbar {
display: block;
}
.wpview-type-gallery.selected .toolbar {
display: block;
}
.wpview-type-gallery .toolbar span,
.wpview-type-audio .toolbar span
.wpview-type-video .toolbar span {
.wpview-type-gallery .toolbar span {
cursor: pointer;
}