FIX: 清理元素样式时，只针对单位为 px 的 font-size 属性进行数值判断

mycolorway · Jan 8, 2018 · d10d0c9 · d10d0c9
1 parent b9ce87c
commit d10d0c9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "simditor",
-  "version": "2.3.8",
+  "version": "2.3.9",
   "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.8
+* Simditor v2.3.9
 * http://simditor.tower.im/
-* 2017-12-11
+* 2018-01-08
 */
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
@@ -713,8 +713,10 @@ Formatter = (function(superClass) {
       if (pair.length !== 2) {
         continue;
       }
-      if (pair[0] === 'font-size' && parseInt(pair[1], 10) < 12) {
-        continue;
+      if (pair[0] === 'font-size' && pair[1].indexOf('px') > 0) {
+        if (parseInt(pair[1], 10) < 12) {
+          continue;
+        }
       }
       if (ref1 = pair[0], indexOf.call(allowedStyles, ref1) >= 0) {
         styles[$.trim(pair[0])] = $.trim(pair[1]);

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

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

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

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