TinyMCE: update to 4.1.7, changelog: https://github.com/tinymce/tinymce/blob/master/changelog.txt. Fixes #30560.
Built from https://develop.svn.wordpress.org/trunk@30675 git-svn-id: http://core.svn.wordpress.org/trunk@30665 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
a0df295f5c
commit
3ad5115eaf
|
@ -228,6 +228,15 @@ tinymce.PluginManager.add('image', function(editor) {
|
|||
});
|
||||
|
||||
if (!meta.width && !meta.height) {
|
||||
var srcURL = this.value(),
|
||||
absoluteURLPattern = new RegExp('^(?:[a-z]+:)?//', 'i'),
|
||||
baseURL = editor.settings.document_base_url;
|
||||
|
||||
//Pattern test the src url and make sure we haven't already prepended the url
|
||||
if (baseURL && !absoluteURLPattern.test(srcURL) && srcURL.substring(0, baseURL.length) !== baseURL) {
|
||||
this.value(baseURL + srcURL);
|
||||
}
|
||||
|
||||
getImageSize(this.value(), function(data) {
|
||||
if (data.width && data.height && imageDimensions) {
|
||||
width = data.width;
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1331,7 +1331,9 @@ define("tinymce/pasteplugin/WordFilter", [
|
|||
var rootNode = domParser.parse(content);
|
||||
|
||||
// Process DOM
|
||||
convertFakeListsToProperLists(rootNode);
|
||||
if (settings.paste_convert_word_fake_lists !== false) {
|
||||
convertFakeListsToProperLists(rootNode);
|
||||
}
|
||||
|
||||
// Serialize DOM back to HTML
|
||||
e.content = new Serializer({}, schema).serialize(rootNode);
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.1-beta2-30674';
|
||||
$wp_version = '4.1-beta2-30675';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
@ -18,7 +18,7 @@ $wp_db_version = 30133;
|
|||
*
|
||||
* @global string $tinymce_version
|
||||
*/
|
||||
$tinymce_version = '4106-20141119';
|
||||
$tinymce_version = '4107-20141130';
|
||||
|
||||
/**
|
||||
* Holds the required PHP version
|
||||
|
|
Loading…
Reference in New Issue