fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by xuhongyun
Commit 895e4a0e4efa14fd914ddfaa78d56786338b3000 2 parents 8282340b 51fde2e0

Merge branch 'hotfix_复制无图片' into grey

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -7143,8 +7143,8 @@ var jQuery = require('jquery'); @@ -7143,8 +7143,8 @@ var jQuery = require('jquery');
7143 } 7143 }
7144 7144
7145 //ie下使用innerHTML会产生多余的\r\n字符，也会产生 这里过滤掉 7145 //ie下使用innerHTML会产生多余的\r\n字符，也会产生 这里过滤掉
7146 - //html = div.innerHTML; //.replace(/>(?:(\s|&nbsp;)*?)</g,'><');  
7147 - html = div.innerText; 7146 + html = div.innerHTML; //.replace(/>(?:(\s|&nbsp;)*?)</g,'><');
  7147 + // html = div.innerText;
7148 7148
7149 /*if (typeof(UMEDITOR_CONFIG.removePasteStyle) != "undefined" && UMEDITOR_CONFIG.removePasteStyle == 1) { 7149 /*if (typeof(UMEDITOR_CONFIG.removePasteStyle) != "undefined" && UMEDITOR_CONFIG.removePasteStyle == 1) {
7150 html = html.replace(/<(p|div)[^>]*>(<br\/?>|&nbsp;)<\/\1>/gi, '\n') 7150 html = html.replace(/<(p|div)[^>]*>(<br\/?>|&nbsp;)<\/\1>/gi, '\n')