diff options
author | friendica <info@friendica.com> | 2012-05-15 17:18:46 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-05-15 17:18:46 -0700 |
commit | e39014a3a765f7afb189be5409b60a771f5c46da (patch) | |
tree | 418391375830247eac3da1eadb5a6993a76b7977 /library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js | |
parent | 205c09e4f0ffd47f91b205c5289633ebb1007f27 (diff) | |
download | volse-hubzilla-e39014a3a765f7afb189be5409b60a771f5c46da.tar.gz volse-hubzilla-e39014a3a765f7afb189be5409b60a771f5c46da.tar.bz2 volse-hubzilla-e39014a3a765f7afb189be5409b60a771f5c46da.zip |
update tinymce to 3.5.0.1
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']]);
|