fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by ZhongW
Commit 0bf731e481f9e5871935ad464bdcfb13c5ae17cb 2 parents 0869e7ed d8cbbca9

Merge branch 'hotfix_复制粘贴图片丢失' into grey

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -7145,12 +7145,12 @@ var jQuery = require('jquery'); @@ -7145,12 +7145,12 @@ var jQuery = require('jquery');
7145 html = div.innerHTML; //.replace(/>(?:(\s|&nbsp;)*?)</g,'><'); 7145 html = div.innerHTML; //.replace(/>(?:(\s|&nbsp;)*?)</g,'><');
7146 // html = div.innerText; 7146 // html = div.innerText;
7147 7147
7148 - /*if (typeof(UMEDITOR_CONFIG.removePasteStyle) != "undefined" && UMEDITOR_CONFIG.removePasteStyle == 1) { 7148 + if (typeof(UMEDITOR_CONFIG.removePasteStyle) != "undefined" && UMEDITOR_CONFIG.removePasteStyle == 1) {
7149 html = html.replace(/<(p|div)[^>]*>(<br\/?>|&nbsp;)<\/\1>/gi, '\n') 7149 html = html.replace(/<(p|div)[^>]*>(<br\/?>|&nbsp;)<\/\1>/gi, '\n')
7150 .replace(/<br\/?>/gi, '\n') 7150 .replace(/<br\/?>/gi, '\n')
7151 .replace(/<[^>/]+>/g, '') 7151 .replace(/<[^>/]+>/g, '')
7152 .replace(/(\n)?<\/([^>]+)>/g, ''); 7152 .replace(/(\n)?<\/([^>]+)>/g, '');
7153 - }*/ 7153 + }
7154 //过滤word粘贴过来的冗余属性 7154 //过滤word粘贴过来的冗余属性
7155 html = UM.filterWord(html); 7155 html = UM.filterWord(html);
7156 //取消了忽略空白的第二个参数，粘贴过来的有些是有空白的，会被套上相关的标签 7156 //取消了忽略空白的第二个参数，粘贴过来的有些是有空白的，会被套上相关的标签