Merge pull request #509 from mycolorway/biallo/fix-span-fontsize

FIX: 在 Chrome 63.0.3239.84 中，粘贴内容的 font-size 可能为 1px 的问题
mycolorway · Dec 11, 2017 · b9ce87c · b9ce87c
2 parents 0075596 + c01f373
commit b9ce87c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "simditor",
-  "version": "2.3.7",
+  "version": "2.3.8",
   "homepage": "http://simditor.tower.im/",
   "authors": [
     "farthinker <farthinker@gmail.com>"

diff --git a/lib/simditor.js b/lib/simditor.js
@@ -1,7 +1,7 @@
 /*!
-* Simditor v2.3.7
+* Simditor v2.3.8
 * http://simditor.tower.im/
-* 2017-11-14
+* 2017-12-11
 */
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
@@ -710,7 +710,10 @@ Formatter = (function(superClass) {
       style = ref[k];
       style = $.trim(style);
       pair = style.split(':');
-      if (!(pair.length = 2)) {
+      if (pair.length !== 2) {
+        continue;
+      }
+      if (pair[0] === 'font-size' && parseInt(pair[1], 10) < 12) {
         continue;
       }
       if (ref1 = pair[0], indexOf.call(allowedStyles, ref1) >= 0) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simditor",
-  "version": "2.3.7",
+  "version": "2.3.8",
   "description": "A simple online editor",
   "keywords": "editor simditor",
   "repository": {

diff --git a/site/assets/scripts/simditor.js b/site/assets/scripts/simditor.js
@@ -705,7 +705,10 @@ Formatter = (function(superClass) {
       style = ref[k];
       style = $.trim(style);
       pair = style.split(':');
-      if (!(pair.length = 2)) {
+      if (pair.length !== 2) {
+        continue;
+      }
+      if (pair[0] === 'font-size' && parseInt(pair[1], 10) < 12) {
         continue;
       }
       if (ref1 = pair[0], indexOf.call(allowedStyles, ref1) >= 0) {

diff --git a/src/formatter.coffee b/src/formatter.coffee
@@ -204,7 +204,10 @@ class Formatter extends SimpleModule
     for style in styleStr.split(';')
       style = $.trim style
       pair = style.split(':')
-      continue unless pair.length = 2
+
+      continue unless pair.length == 2
+      continue if pair[0] == 'font-size' and parseInt(pair[1], 10) < 12
+
       styles[$.trim(pair[0])] = $.trim(pair[1]) if pair[0] in allowedStyles
 
     $node.css styles if Object.keys(styles).length > 0

diff --git a/styles/simditor.css b/styles/simditor.css
@@ -1,7 +1,7 @@
 /*!
-* Simditor v2.3.7
+* Simditor v2.3.8
 * http://simditor.tower.im/
-* 2017-11-14
+* 2017-12-11
 */
 @font-face {
   font-family: 'Simditor';