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

TinyMCE: restore support for `<script>` tags. 

See #33083.
Built from https://develop.svn.wordpress.org/trunk@33414


git-svn-id: http://core.svn.wordpress.org/trunk@33382 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-07-24 22:04:25 +00:00
parent de86d6b18d
commit 87aaf3bcfe
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/js/tinymce/plugins/wordpress/plugin.js
View File

@ -485,8 +485,13 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
}); });
editor.on( 'preInit', function() { editor.on( 'preInit', function() {
// Don't replace <i> with <em> and <b> with <strong> and don't remove them when empty var validElementsSetting = '@[id|accesskey|class|dir|lang|style|tabindex|' +
editor.schema.addValidElements( '@[id|accesskey|class|dir|lang|style|tabindex|title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],i,b' ); 'title|contenteditable|draggable|dropzone|hidden|spellcheck|translate],' + // Global attributes.
'i,' + // Don't replace <i> with <em> and <b> with <strong> and don't remove them when empty.
'b,' +
'script[src|async|defer|type|charset|crossorigin|integrity]'; // Add support for <script>.
editor.schema.addValidElements( validElementsSetting );
if ( tinymce.Env.iOS ) { if ( tinymce.Env.iOS ) {
editor.settings.height = 300; editor.settings.height = 300;

2
wp-includes/js/tinymce/plugins/wordpress/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-beta4-33413'; $wp_version = '4.3-beta4-33414';
/** /**
* 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.