v3.0.16

wangfupeng1988 · wangfupeng1988 · commit 9ddf6b7295cd · 2018-02-14T19:59:02.000+08:00
diff --git a/ISSUE.md b/ISSUE.md
@@ -116,8 +116,20 @@
 
 - [done] 表情兼容图片和 emoji ，都可自定义配置
 
+### v3.0.16
+
+- [done] 修复粘贴图片的 bug
+- [done] 修复`pasteTextHandle`执行两次的问题
+- [done] 修复插入链接时，文字和链接为空时，`linkCheck`不执行的 bug
+- [done] 粘贴 html 时，过滤掉其中的`data-xxx`属性
+- [done] 修复中文输入法输入过程中出发 onchange 的问题，感谢 [github.com/CongAn](https://github.com/CongAn) PR
+- [done] `editor.txt.html`和`editor.txt.text`中，替换`&#8203`字符为空字符串
+- [done] 精确图片大小计算，将`maxSize / 1000 / 1000`改为`maxSize / 1024 / 1024`
+- [done] 修复 droplist 类型菜单（颜色、背景色等）点击不准确的问题
+
 ### 近期计划解决
 
+- 合并 pr https://github.com/wangfupeng1988/wangEditor/pulls
 - 撤销的兼容性问题（会误伤其他编辑器或者 input textarea 等），考虑用 onchange 记录 undo 和 redo 的内容（但是得考虑直接修改 dom 的情况，如 quote code img list table 菜单）
     - 列表撤销会删除一行？https://github.com/wangfupeng1988/wangEditor/issues/1131
     - 页面中有 input 等输入标签时，undo redo 会误伤 https://github.com/wangfupeng1988/wangEditor/issues/1024
diff --git a/docs/usage/04-uploadimg/03-upload-config.md b/docs/usage/04-uploadimg/03-upload-config.md
@@ -28,19 +28,19 @@
 </script>
 ```
 
-其中`/upload`是上传图片的服务器端接口，接口返回的**数据格式**如下
+其中`/upload`是上传图片的服务器端接口，接口返回的**数据格式**如下（**实际返回数据时，不要加任何注释！！！**）
 
 ```json
 {
     // errno 即错误代码，0 表示没有错误。
     //       如果有错误，errno != 0，可通过下文中的监听函数 fail 拿到该错误码进行自定义处理
-    errno: 0,
+    "errno": 0,
 
     // data 是一个数组，返回若干图片的线上地址
-    data: [
-        '图片1地址',
-        '图片2地址',
-        '……'
+    "data": [
+        "图片1地址",
+        "图片2地址",
+        "……"
     ]
 }
 ```
diff --git a/example/demo/test-paste.html b/example/demo/test-paste.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>wangEditor paste test</title>
+</head>
+<body>
+    <p>wangEditor paste test</p>
+    <div id="div1">
+        <p>欢迎使用 wangEditor 富文本编辑器</p>
+    </div>
+
+    <script type="text/javascript" src="/wangEditor.min.js"></script>
+    <script type="text/javascript">
+        var E = window.wangEditor
+        var editor = new E('#div1')
+        // editor.customConfig.pasteFilterStyle = false
+        editor.customConfig.pasteTextHandle = function (content) {
+            console.log(content)
+            return content
+        }
+        editor.create()
+    </script>
+</body>
+</html>
diff --git a/example/index.html b/example/index.html
@@ -34,6 +34,7 @@
                 <li><a href="demo/test-onchange.html" target="_blank">onchange</a></li>
                 <li><a href="demo/test-getJSON.html" target="_blank">获取 JSON</a></li>
                 <li><a href="demo/test-emot.html" target="_blank">配置表情</a></li>
+                <li><a href="demo/test-paste.html" target="_blank">粘贴</a></li>
             </ul>
         </div>
 
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wangeditor",
   "title": "wangEditor",
-  "version": "3.0.15",
+  "version": "3.0.16",
   "description": "wangEditor - 基于javascript和css开发的 web 富文本编辑器， 轻量、简洁、易用、开源免费",
   "homepage": "http://wangeditor.github.io/",
   "author": {
diff --git a/release/wangEditor.css b/release/wangEditor.css
@@ -167,6 +167,7 @@
   display: -ms-flexbox;
   display: flex;
   padding: 0 5px;
+  /* flex-wrap: wrap; */
   /* 单个菜单 */
 }
 .w-e-toolbar .w-e-menu {
diff --git a/release/wangEditor.js b/release/wangEditor.js
diff --git a/release/wangEditor.min.js b/release/wangEditor.min.js
diff --git a/release/wangEditor.min.js.map b/release/wangEditor.min.js.map
diff --git a/src/js/editor/index.js b/src/js/editor/index.js
@@ -128,21 +128,20 @@ Editor.prototype = {
         this.toolbarElemId = toolbarElemId
         this.textElemId = textElemId
 
-        // 记录输入法是否已输入结束
+        // 记录输入法的开始和结束
         let compositionEnd = true
-
-        // 输入法开始输入
         $textContainerElem.on('compositionstart', () => {
+            // 输入法开始输入
             compositionEnd = false
         })
-
-        // 输入法结束输入
         $textContainerElem.on('compositionend', () => {
+            // 输入法结束输入
             compositionEnd = true
         })
 
         // 绑定 onchange
         $textContainerElem.on('click keyup', () => {
+            // 输入法结束才出发 onchange
             compositionEnd && this.change &&  this.change()
         })
         $toolbarElem.on('click', function () {
diff --git a/src/js/editor/upload/upload-img.js b/src/js/editor/upload/upload-img.js
@@ -89,7 +89,7 @@ UploadImg.prototype = {
         const uploadImgShowBase64 = config.uploadImgShowBase64
 
         const maxSize = config.uploadImgMaxSize
-        const maxSizeM = maxSize / 1000 / 1000
+        const maxSizeM = maxSize / 1024 / 1024
         const maxLength = config.uploadImgMaxLength || 10000
         const uploadFileName = config.uploadFileName || ''
         const uploadImgParams = config.uploadImgParams || {}
diff --git a/src/js/menus/droplist.js b/src/js/menus/droplist.js
@@ -48,7 +48,7 @@ function DropList(menu, opt) {
         if ($elem) {
             $li.append($elem)
             $list.append($li)
-            $elem.on('click', e => {
+            $li.on('click', e => {
                 onClick(value)
 
                 // 隐藏
diff --git a/src/js/menus/link/index.js b/src/js/menus/link/index.js
@@ -133,9 +133,6 @@ Link.prototype = {
 
     // 插入链接
     _insertLink: function (text, link) {
-        if (!text || !link) {
-            return
-        }
         const editor = this.editor
         const config = editor.config
         const linkCheck = config.linkCheck
diff --git a/src/js/text/index.js b/src/js/text/index.js
@@ -4,7 +4,7 @@
 
 import $ from '../util/dom-core.js'
 import { getPasteText, getPasteHtml, getPasteImgs } from '../util/paste-handle.js'
-import { UA } from '../util/util.js'
+import { UA, isFunction } from '../util/util.js'
 
 // 获取一个 elem.childNodes 的 JSON 数据
 function getChildrenJSON($elem) {
@@ -70,8 +70,12 @@ Text.prototype = {
     html: function (val) {
         const editor = this.editor
         const $textElem = editor.$textElem
+        let html
         if (val == null) {
-            return $textElem.html()
+            html = $textElem.html()
+            // 未选中任何内容的时候点击“加粗”或者“斜体”等按钮，就得需要一个空的占位符 &#8203 ，这里替换掉
+            html = html.replace(/\u200b/gm, '')
+            return html
         } else {
             $textElem.html(val)
 
@@ -91,8 +95,12 @@ Text.prototype = {
     text: function (val) {
         const editor = this.editor
         const $textElem = editor.$textElem
+        let text
         if (val == null) {
-            return $textElem.text()
+            text = $textElem.text()
+            // 未选中任何内容的时候点击“加粗”或者“斜体”等按钮，就得需要一个空的占位符 &#8203 ，这里替换掉
+            text = text.replace(/\u200b/gm, '')
+            return text
         } else {
             $textElem.text(`<p>${val}</p>`)
 
@@ -341,6 +349,9 @@ Text.prototype = {
             pasteTime = now
             return flag
         }
+        function resetTime() {
+            pasteTime = 0
+        }
 
         // 粘贴文字
         $textElem.on('paste', e => {
@@ -361,12 +372,6 @@ Text.prototype = {
             let pasteText = getPasteText(e)
             pasteText = pasteText.replace(/\n/gm, '<br>')
 
-            // 自定义处理粘贴的内容
-            if (pasteTextHandle && typeof pasteTextHandle === 'function') {
-                pasteHtml = '' + (pasteTextHandle(pasteHtml) || '')
-                pasteText = '' + (pasteTextHandle(pasteText) || '')
-            }
-
             const $selectionElem = editor.selection.getSelectionContainerElem()
             if (!$selectionElem) {
                 return
@@ -375,6 +380,10 @@ Text.prototype = {
 
             // code 中只能粘贴纯文本
             if (nodeName === 'CODE' || nodeName === 'PRE') {
+                if (pasteTextHandle && isFunction(pasteTextHandle)) {
+                    // 用户自定义过滤处理粘贴内容
+                    pasteText = '' + (pasteTextHandle(pasteText) || '')
+                }
                 editor.cmd.do('insertHTML', `<p>${pasteText}</p>`)
                 return
             }
@@ -386,14 +395,24 @@ Text.prototype = {
             // }
 
             if (!pasteHtml) {
+                // 没有内容，可继续执行下面的图片粘贴
+                resetTime()
                 return
             }
             try {
                 // firefox 中，获取的 pasteHtml 可能是没有 <ul> 包裹的 <li>
                 // 因此执行 insertHTML 会报错
+                if (pasteTextHandle && isFunction(pasteTextHandle)) {
+                    // 用户自定义过滤处理粘贴内容
+                    pasteHtml = '' + (pasteTextHandle(pasteHtml) || '')
+                }
                 editor.cmd.do('insertHTML', pasteHtml)
             } catch (ex) {
                 // 此时使用 pasteText 来兼容一下
+                if (pasteTextHandle && isFunction(pasteTextHandle)) {
+                    // 用户自定义过滤处理粘贴内容
+                    pasteText = '' + (pasteTextHandle(pasteText) || '')
+                }
                 editor.cmd.do('insertHTML', `<p>${pasteText}</p>`)
             }
         })
diff --git a/src/js/util/paste-handle.js b/src/js/util/paste-handle.js
@@ -46,6 +46,8 @@ export function getPasteHtml(e, filterStyle) {
     pasteHtml = pasteHtml.replace(/<(meta|script|link).+?>/igm, '')
     // 去掉注释
     pasteHtml = pasteHtml.replace(/<!--.*?-->/mg, '')
+    // 过滤 data-xxx 属性
+    pasteHtml = pasteHtml.replace(/\s?data-.+?=('|").+?('|")/igm, '')
 
     if (filterStyle) {
         // 过滤样式
diff --git a/src/js/util/util.js b/src/js/util/util.js
@@ -65,3 +65,7 @@ export function percentFormat(number) {
     return number + '%'
 }
 
+// 判断是不是 function
+export function isFunction(fn) {
+    return typeof fn === 'function'
+}
diff --git a/src/less/menus.less b/src/less/menus.less
@@ -1,7 +1,7 @@
 .w-e-toolbar {
     display: flex;
     padding: 0 5px;
-    flex-wrap: wrap;
+    /* flex-wrap: wrap; */
 
     /* 单个菜单 */
     .w-e-menu {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "wangeditor",`
`3`	`3`	`"title": "wangEditor",`
`4`		`- "version": "3.0.15",`
	`4`	`+ "version": "3.0.16",`
`5`	`5`	`"description": "wangEditor - 基于javascript和css开发的 web 富文本编辑器，轻量、简洁、易用、开源免费",`
`6`	`6`	`"homepage": "http://wangeditor.github.io/",`
`7`	`7`	`"author": {`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,7 @@`
`167`	`167`	`display: -ms-flexbox;`
`168`	`168`	`display: flex;`
`169`	`169`	`padding: 0 5px;`
	`170`	`+ /* flex-wrap: wrap; */`
`170`	`171`	`/* 单个菜单 */`
`171`	`172`	`}`
`172`	`173`	`.w-e-toolbar .w-e-menu {`