summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--editors/js/tinymce-2.js5
-rw-r--r--editors/js/tinymce-3.js5
3 files changed, 11 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1a0e910..1fe940f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 6.x-3.x, xxxx-xx-xx
---------------------------
+#715228 by TwoD: Fixed TinyMCE image popups not launching for existing images.
#606952 by TwoD: Fixed inserting content in fullscreen TinyMCE.
#593008 by TwoD: Fixed third-party scripts breaking Wysiwyg.
#695398 by RichieB, Cl1mh4224rd, mcpuddin: Fixed TinyMCE 3.3.9.1 detection.
diff --git a/editors/js/tinymce-2.js b/editors/js/tinymce-2.js
index 9fac974..a09e5aa 100644
--- a/editors/js/tinymce-2.js
+++ b/editors/js/tinymce-2.js
@@ -48,6 +48,11 @@ Drupal.wysiwyg.editor.attach.tinymce = function(context, params, settings) {
for (var setting in settings) {
tinyMCE.settings[setting] = settings[setting];
}
+
+ // #715228: Remove extra mceItem class added by Wysiwyg < v2.1.
+ $field = $('#' + params.field);
+ $field.val($field.val().replace(/class=(['"].*?)\bmceItem\b(.*?['"])/ig, 'class=$1$2'));
+
// Attach editor.
tinyMCE.execCommand('mceAddControl', true, params.field);
};
diff --git a/editors/js/tinymce-3.js b/editors/js/tinymce-3.js
index 2ac3906..b935e2d 100644
--- a/editors/js/tinymce-3.js
+++ b/editors/js/tinymce-3.js
@@ -64,6 +64,11 @@ Drupal.wysiwyg.editor.attach.tinymce = function(context, params, settings) {
$('#' + ed.editorContainer + ' table.mceLayout td.mceToolbar').append($toolbar);
$('#' + ed.editorContainer + ' table.mceToolbar').remove();
});
+
+ // #715228: Remove extra mceItem class added by Wysiwyg < v2.1.
+ $field = $('#' + params.field);
+ $field.val($field.val().replace(/class=(['"].*?)\bmceItem\b(.*?['"])/ig, 'class=$1$2'));
+
// Attach editor.
ed.render();
};