v3.1.0 part

songyu1980 · Mar 7, 2018 · 4cf79a1 · 4cf79a1
1 parent e5e101c
commit 4cf79a1
Show file tree

Hide file tree

Showing 19 changed files with 129 additions and 277 deletions.
diff --git a/ISSUE.md b/ISSUE.md
@@ -132,6 +132,11 @@
 - [done] 合并 pr [菜单和编辑区域分离 onfocus onblur 失效bug](https://github.com/wangfupeng1988/wangEditor/pull/1174) ，感谢 [hold-baby](https://github.com/hold-baby) 提供 pr
 - [done] 使用`document.execCommand("styleWithCSS", null, true)`，这样设置字体颜色就会用 css 而不是用`<font color=xxx>`
 
+### v3.1.0
+
+- 视图增加 “字体” “字号”
+- 外露的修改图片大小的按钮
+- https://github.com/wangfupeng1988/wangEditor/issues/512
 
 ### 近期计划解决
 

diff --git a/README.md b/README.md
@@ -61,8 +61,8 @@ editor.create()
 
 ## 关于作者
 
-- 关注作者的博客 - 《[深入理解javascript原型和闭包系列](http://www.cnblogs.com/wangfupeng1988/p/4001284.html)》《[深入理解javascript异步系列](https://github.com/wangfupeng1988/js-async-tutorial)》《[CSS知多少](http://www.cnblogs.com/wangfupeng1988/p/4325007.html)》 
-- 学习作者的教程 - 《[前端JS基础面试题](http://coding.imooc.com/class/115.html)》《[React.js模拟大众点评webapp](http://coding.imooc.com/class/99.html)》《[zepto设计与源码分析](http://www.imooc.com/learn/745)》《[用grunt搭建自动化的web前端开发环境](http://study.163.com/course/courseMain.htm?courseId=1103003)》《[json2.js源码解读](http://study.163.com/course/courseMain.htm?courseId=691008)》
+- 关注作者的博客 - 《[深入理解javascript原型和闭包系列](http://www.cnblogs.com/wangfupeng1988/p/4001284.html)》《[深入理解javascript异步系列](https://github.com/wangfupeng1988/js-async-tutorial)》《[换个思路学习nodejs](https://github.com/wangfupeng1988/node-tutorial)》《[CSS知多少](http://www.cnblogs.com/wangfupeng1988/p/4325007.html)》 
+- 学习作者的教程 - 《[前端JS高级面试](https://coding.imooc.com/class/190.html)》《[前端JS基础面试题](http://coding.imooc.com/class/115.html)》《[React.js模拟大众点评webapp](http://coding.imooc.com/class/99.html)》《[zepto设计与源码分析](http://www.imooc.com/learn/745)》《[json2.js源码解读](http://study.163.com/course/courseMain.htm?courseId=691008)》
 
 如果你感觉有收获，欢迎给我打赏 ———— 以激励我更多输出优质开源内容
 

diff --git a/example/icomoon/demo.html b/example/icomoon/demo.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="style.css"></head>
 <body>
     <div class="bgc1 clearfix">
-        <h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;27)</small></h1>
+        <h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;29)</small></h1>
     </div>
     <div class="clearfix mhl ptl">
         <h1 class="mvm mtn fgc1">Grid Size: 14</h1>
@@ -336,6 +336,38 @@ <h1 class="mvm mtn fgc1">Grid Size: 16</h1>
                 <input type="text" readonly value="cancel-circle, close" class="liga unitRight" />
             </div>
         </div>
+        <div class="glyph fs2">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon-font">
+
+                </span>
+                <span class="mls"> icon-font</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="ea5c" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#xea5c;" class="unitRight size1of2 talign-right" />
+            </fieldset>
+            <div class="fs0 bshadow0 clearfix hidden-true">
+                <span class="unit pvs fgc1">liga: </span>
+                <input type="text" readonly value="font, typeface" class="liga unitRight" />
+            </div>
+        </div>
+        <div class="glyph fs2">
+            <div class="clearfix bshadow0 pbs">
+                <span class="icon-text-height">
+
+                </span>
+                <span class="mls"> icon-text-height</span>
+            </div>
+            <fieldset class="fs0 size1of1 clearfix hidden-false">
+                <input type="text" readonly value="ea5f" class="unit size1of2" />
+                <input type="text" maxlength="1" readonly value="&#xea5f;" class="unitRight size1of2 talign-right" />
+            </fieldset>
+            <div class="fs0 bshadow0 clearfix hidden-true">
+                <span class="unit pvs fgc1">liga: </span>
+                <input type="text" readonly value="text-height, wysiwyg" class="liga unitRight" />
+            </div>
+        </div>
         <div class="glyph fs2">
             <div class="clearfix bshadow0 pbs">
                 <span class="icon-bold">

diff --git a/example/icomoon/fonts/icomoon.eot b/example/icomoon/fonts/icomoon.eot
diff --git a/example/icomoon/fonts/icomoon.svg b/example/icomoon/fonts/icomoon.svg
diff --git a/example/icomoon/fonts/icomoon.ttf b/example/icomoon/fonts/icomoon.ttf
diff --git a/example/icomoon/fonts/icomoon.woff b/example/icomoon/fonts/icomoon.woff
diff --git a/example/icomoon/selection.json b/example/icomoon/selection.json
@@ -498,6 +498,61 @@
       "setId": 1,
       "iconIdx": 269
     },
+    {
+      "icon": {
+        "paths": [
+          "M799.596 16.208c-90.526 0-148.62-16.208-241.848-16.208-301.284 0-441.792 171.584-441.792 345.872 0 102.678 48.64 136.458 144.564 136.458-6.758-14.864-18.914-31.080-18.914-104.034 0-204.010 77.006-263.458 175.636-267.51 0 0-80.918 793.374-315.778 888.542v24.672h316.594l108.026-512h197.844l44.072-128h-214.908l51.944-246.19c59.446 12.156 117.542 24.316 167.532 24.316 62.148 0 118.894-18.914 149.968-162.126-37.826 12.16-78.362 16.208-122.94 16.208z"
+        ],
+        "tags": [
+          "font",
+          "typeface",
+          "typography",
+          "font-family",
+          "wysiwyg"
+        ],
+        "defaultCode": 59996,
+        "grid": 16,
+        "attrs": []
+      },
+      "attrs": [],
+      "properties": {
+        "ligatures": "font, typeface",
+        "name": "font",
+        "order": 61,
+        "id": 349,
+        "prevSize": 16,
+        "code": 59996
+      },
+      "setIdx": 1,
+      "setId": 1,
+      "iconIdx": 348
+    },
+    {
+      "icon": {
+        "paths": [
+          "M896 768h128l-160 192-160-192h128v-512h-128l160-192 160 192h-128zM640 64v256l-64-128h-192v704h128v64h-384v-64h128v-704h-192l-64 128v-256z"
+        ],
+        "tags": [
+          "text-height",
+          "wysiwyg"
+        ],
+        "defaultCode": 59999,
+        "grid": 16,
+        "attrs": []
+      },
+      "attrs": [],
+      "properties": {
+        "ligatures": "text-height, wysiwyg",
+        "name": "text-height",
+        "order": 62,
+        "id": 352,
+        "prevSize": 16,
+        "code": 59999
+      },
+      "setIdx": 1,
+      "setId": 1,
+      "iconIdx": 351
+    },
     {
       "icon": {
         "paths": [

diff --git a/example/icomoon/style.css b/example/icomoon/style.css
@@ -1,10 +1,10 @@
 @font-face {
   font-family: 'icomoon';
-  src:  url('fonts/icomoon.eot?b1ngen');
-  src:  url('fonts/icomoon.eot?b1ngen#iefix') format('embedded-opentype'),
-    url('fonts/icomoon.ttf?b1ngen') format('truetype'),
-    url('fonts/icomoon.woff?b1ngen') format('woff'),
-    url('fonts/icomoon.svg?b1ngen#icomoon') format('svg');
+  src:  url('fonts/icomoon.eot?mlkkjs');
+  src:  url('fonts/icomoon.eot?mlkkjs#iefix') format('embedded-opentype'),
+    url('fonts/icomoon.ttf?mlkkjs') format('truetype'),
+    url('fonts/icomoon.woff?mlkkjs') format('woff'),
+    url('fonts/icomoon.svg?mlkkjs#icomoon') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -84,6 +84,12 @@
 .icon-cancel-circle:before {
   content: "\ea0d";
 }
+.icon-font:before {
+  content: "\ea5c";
+}
+.icon-text-height:before {
+  content: "\ea5f";
+}
 .icon-bold:before {
   content: "\ea62";
 }

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "wangeditor",
   "title": "wangEditor",
-  "version": "3.0.17",
+  "version": "3.1.0",
   "description": "wangEditor - 基于javascript和css开发的 web 富文本编辑器， 轻量、简洁、易用、开源免费",
   "homepage": "http://wangeditor.github.io/",
   "author": {

diff --git a/release/fonts/w-e-icon.woff b/release/fonts/w-e-icon.woff