diff options
author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-04 12:04:17 +0530 |
---|---|---|
committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-04 12:04:17 +0530 |
commit | 12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89 (patch) | |
tree | 49e5e7dd30e1b1263fa5a9c9921b4a59758d94bd /library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js | |
parent | 3a45d4f9e0af301b8fdd4d509fc7ffe7514fb519 (diff) | |
parent | ca105f1c669950768a1f4cd6b93f471cabbc5114 (diff) | |
download | volse-hubzilla-12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89.tar.gz volse-hubzilla-12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89.tar.bz2 volse-hubzilla-12474e3c2eb21e4b5f9f6cd4b9d223f1f39bfe89.zip |
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js')
-rw-r--r-- | library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js index 73fe7fe9a..9f1c35476 100644 --- a/library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js +++ b/library/tinymce/jscripts/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> [\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> [\s\r\n]+|<br>)*/g, '$1']]);
|