Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-02 13:41:24 +01:00
Code Issues Projects Releases Wiki Activity

TinyMCE: views: make sure gallery captions update

Browse Source 
Part props dmsnell.
Fixes #32779.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ella Iseulde Van Dorpe 2015-07-20 23:56:25 +00:00
parent 1d92ed1c79
commit 1ab119798c
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
wp-includes/js/mce-view.js
View File

@ -145,22 +145,26 @@ window.wp = window.wp || {};
/**
* Create a view instance.
*
* @param {String} type The view type.
* @param {String} text The textual representation of the view.
* @param {Object} options Options.
* @param {String} type The view type.
* @param {String} text The textual representation of the view.
* @param {Object} options Options.
* @param {Boolean} force Recreate the instance. Optional.
*
* @return {wp.mce.View} The view instance.
*/
createInstance: function( type, text, options ) {
createInstance: function( type, text, options, force ) {
var View = this.get( type ),
encodedText,
instance;
text = tinymce.DOM.decode( text );
instance = this.getInstance( text );
if ( instance ) {
return instance;
if ( ! force ) {
instance = this.getInstance( text );
if ( instance ) {
return instance;
}
}
encodedText = encodeURIComponent( text );
@ -216,12 +220,13 @@ window.wp = window.wp || {};
* @param {String} text The new text.
* @param {tinymce.Editor} editor The TinyMCE editor instance the view node is in.
* @param {HTMLElement} node The view node to update.
* @param {Boolean} force Recreate the instance. Optional.
*/
update: function( text, editor, node ) {
update: function( text, editor, node, force ) {
var instance = this.getInstance( node );
if ( instance ) {
instance.update( text, editor, node );
instance.update( text, editor, node, force );
}
},
@ -235,8 +240,8 @@ window.wp = window.wp || {};
var instance = this.getInstance( node );
if ( instance && instance.edit ) {
instance.edit( instance.text, function( text ) {
instance.update( text, editor, node );
instance.edit( instance.text, function( text, force ) {
instance.update( text, editor, node, force );
} );
}
},
@ -302,8 +307,8 @@ window.wp = window.wp || {};
/**
* Renders all view nodes tied to this view instance that are not yet rendered.
*
* @param {String} content The content to render. Optional.
* @param {Boolean} force Rerender all view nodes tied to this view instance.
* @param {String} content The content to render. Optional.
* @param {Boolean} force Rerender all view nodes tied to this view instance. Optional.
*/
render: function( content, force ) {
if ( content != null ) {
@ -647,7 +652,7 @@ window.wp = window.wp || {};
* Sets an error for all view nodes tied to this view instance.
*
* @param {String} message The error message to set.
* @param {String} dashicon A dashicon ID (optional). {@link https://developer.wordpress.org/resource/dashicons/}
* @param {String} dashicon A dashicon ID. Optional. {@link https://developer.wordpress.org/resource/dashicons/}
*/
setError: function( message, dashicon ) {
this.setContent(
@ -685,15 +690,16 @@ window.wp = window.wp || {};
* @param {String} text The new text.
* @param {tinymce.Editor} editor The TinyMCE editor instance the view node is in.
* @param {HTMLElement} node The view node to update.
* @param {Boolean} force Recreate the instance. Optional.
*/
update: function( text, editor, node ) {
update: function( text, editor, node, force ) {
_.find( views, function( view, type ) {
var match = view.prototype.match( text );
if ( match ) {
$( node ).data( 'rendered', false );
editor.dom.setAttrib( node, 'data-wpview-text', encodeURIComponent( text ) );
wp.mce.views.createInstance( type, text, match.options ).render();
wp.mce.views.createInstance( type, text, match.options, force ).render();
editor.focus();
return true;
@ -729,14 +735,15 @@ window.wp = window.wp || {};
state: [],
edit: function( text, update ) {
var media = wp.media[ this.type ],
var type = this.type,
media = wp.media[ type ],
frame = media.edit( text );
this.pausePlayers && this.pausePlayers();
_.each( this.state, function( state ) {
frame.state( state ).on( 'update', function( selection ) {
update( media.shortcode( selection ).string() );
update( media.shortcode( selection ).string(), type === 'gallery' );
} );
} );

2
wp-includes/js/mce-view.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-beta3-33337';
$wp_version = '4.3-beta3-33338';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.