Просмотр исходного кода

Merge pull request #396 from weseek/imprv/count-multibyte-in-md-table

imprv/count-multibyte-in-md-table
Yuki Takei 8 лет назад
Родитель
Сommit
0611ae4476
2 измененных файлов с 5 добавлено и 3 удалено
  1. 1 0
      package.json
  2. 4 3
      resource/js/components/PageEditor/MarkdownTableUtil.js

+ 1 - 0
package.json

@@ -147,6 +147,7 @@
     "slack-node": "^0.1.8",
     "socket.io": "^2.0.3",
     "socket.io-client": "^2.0.3",
+    "string-width": "^2.1.1",
     "style-loader": "^0.21.0",
     "swig-templates": "^2.0.2",
     "throttle-debounce": "^1.0.1",

+ 4 - 3
resource/js/components/PageEditor/MarkdownTableUtil.js

@@ -1,4 +1,5 @@
-import markdown_table from 'markdown-table';
+import markdownTable from 'markdown-table';
+import stringWidth from 'string-width';
 
 /**
  * Utility for markdown table
@@ -128,7 +129,7 @@ class MarkdownTableUtil {
         contents.push(row);
       }
     }
-    return (new MarkdownTable(contents, { align: aligns }));
+    return (new MarkdownTable(contents, { align: aligns, stringLength: stringWidth }));
   }
 
   /**
@@ -200,7 +201,7 @@ class MarkdownTable {
   }
 
   toString() {
-    return markdown_table(this.table, this.options);
+    return markdownTable(this.table, this.options);
   }
 }