summaryrefslogtreecommitdiff
path: root/program/js/tiny_mce/plugins/paste/editor_plugin_src.js
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-05-08 11:38:39 +0200
committerAleksander Machniak <alec@alec.pl>2012-05-08 11:38:39 +0200
commite6e0d410ac92818679c03fc9bf5359562df81921 (patch)
treefff5c213ce3e88b448ca1365b375137a52f6fa4c /program/js/tiny_mce/plugins/paste/editor_plugin_src.js
parent5b0b034387715a18910a7e574b71afcfae293ecf (diff)
TinyMCE 3.5
Diffstat (limited to 'program/js/tiny_mce/plugins/paste/editor_plugin_src.js')
-rw-r--r--program/js/tiny_mce/plugins/paste/editor_plugin_src.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/js/tiny_mce/plugins/paste/editor_plugin_src.js b/program/js/tiny_mce/plugins/paste/editor_plugin_src.js
index 73fe7fe9a..9f1c35476 100644
--- a/program/js/tiny_mce/plugins/paste/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/paste/editor_plugin_src.js
@@ -359,7 +359,7 @@
}
// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
- if (tinymce.isIE && document.documentMode >= 9) {
+ if (tinymce.isIE && document.documentMode >= 9 && /<(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)/.test(o.content)) {
// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
process([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g, '$1']]);