WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TinyMCE: add support for custom dashicon for wp.mce.View.setLoader(). 

Props procodewp.
Fixes #37900.
Built from https://develop.svn.wordpress.org/trunk@38774


git-svn-id: http://core.svn.wordpress.org/trunk@38717 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2016-10-11 00:56:29 +00:00
parent cb966db094
commit af8eaef148
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -636,10 +636,10 @@
/** /**
* Sets a loader for all view nodes tied to this view instance. * Sets a loader for all view nodes tied to this view instance.
*/ */
setLoader: function() { setLoader: function( dashicon ) {
this.setContent( this.setContent(
'<div class="loading-placeholder">' + '<div class="loading-placeholder">' +
'<div class="dashicons dashicons-admin-media"></div>' + '<div class="dashicons dashicons-' + ( dashicon || 'admin-media' ) + '"></div>' +
'<div class="wpview-loading"><ins></ins></div>' + '<div class="wpview-loading"><ins></ins></div>' +
'</div>' '</div>'
); );

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 * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38773'; $wp_version = '4.7-alpha-38774';
/** /**
* 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.