sergiotarxz/Wordpress
sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TinyMCE: include 85e22b58e9that and quote one more use of "float". This is "reserved as future keyword by older ECMAScript specifications" according to https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar and can throw a syntax error. See #28576.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@29261 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2014-07-21 23:04:29 +00:00
parent dfa33f92ff
commit 9106987a3f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/js/tinymce/tinymce.js
View File

@ -3465,7 +3465,7 @@ define("tinymce/dom/DomQuery", [
'readonly': 'readOnly' 'readonly': 'readOnly'
}; };
var cssFix = { var cssFix = {
float: 'cssFloat' 'float': 'cssFloat'
}; };
var attrHooks = {}, cssHooks = {}; var attrHooks = {}, cssHooks = {};
@ -4868,7 +4868,7 @@ define("tinymce/dom/DomQuery", [
} }
if (Env.ie && Env.ie < 9) { if (Env.ie && Env.ie < 9) {
cssFix.float = 'styleFloat'; cssFix['float'] = 'styleFloat';
appendHooks(cssHooks, 'set', { appendHooks(cssHooks, 'set', {
opacity: function(elm, value) { opacity: function(elm, value) {

6
src/wp-includes/js/tinymce/tinymce.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
src/wp-includes/version.php
View File

@ -18,7 +18,7 @@ $wp_db_version = 29188;
* *
* @global string $tinymce_version * @global string $tinymce_version
*/ */
$tinymce_version = '4102-20140717'; $tinymce_version = '4102-20140721';
/** /**
* Holds the required PHP version * Holds the required PHP version