Skip to content

Commit 45f4403

Browse files
azaozzazaozz
committed
TinyMCE: update to 4.1.7, changelog: https://github.com/tinymce/tinymce/blob/master/changelog.txt. Fixes #30560.
git-svn-id: https://develop.svn.wordpress.org/trunk@30675 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 0632a3d commit 45f4403

13 files changed

Lines changed: 145 additions & 31 deletions

File tree

‎src/wp-includes/js/tinymce/plugins/image/plugin.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,15 @@ tinymce.PluginManager.add('image', function(editor) {
228228
});
229229

230230
if (!meta.width && !meta.height) {
231+
var srcURL = this.value(),
232+
absoluteURLPattern = new RegExp('^(?:[a-z]+:)?//', 'i'),
233+
baseURL = editor.settings.document_base_url;
234+
235+
//Pattern test the src url and make sure we haven't already prepended the url
236+
if (baseURL && !absoluteURLPattern.test(srcURL) && srcURL.substring(0, baseURL.length) !== baseURL) {
237+
this.value(baseURL + srcURL);
238+
}
239+
231240
getImageSize(this.value(), function(data) {
232241
if (data.width && data.height && imageDimensions) {
233242
width = data.width;

‎src/wp-includes/js/tinymce/plugins/image/plugin.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/wp-includes/js/tinymce/plugins/paste/plugin.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1331,7 +1331,9 @@ define("tinymce/pasteplugin/WordFilter", [
13311331
var rootNode = domParser.parse(content);
13321332

13331333
// Process DOM
1334-
convertFakeListsToProperLists(rootNode);
1334+
if (settings.paste_convert_word_fake_lists !== false) {
1335+
convertFakeListsToProperLists(rootNode);
1336+
}
13351337

13361338
// Serialize DOM back to HTML
13371339
e.content = new Serializer({}, schema).serialize(rootNode);

0 commit comments

Comments
 (0)