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

Merge pull request #627 from weseek/fix/handle-newline-codes-problem

Fix/handle newline codes problem
Yuki Takei 7 лет назад
Родитель
Сommit
a3bf2ebce9

+ 1 - 1
src/client/js/components/Page.js

@@ -76,7 +76,7 @@ export default class Page extends React.Component {
    * @param endLineNumber
    * @param endLineNumber
    */
    */
   launchHandsontableModal(beginLineNumber, endLineNumber) {
   launchHandsontableModal(beginLineNumber, endLineNumber) {
-    const tableLines = this.state.markdown.split('\n').slice(beginLineNumber - 1, endLineNumber).join('\n');
+    const tableLines = this.state.markdown.split(/\r\n|\r|\n/).slice(beginLineNumber - 1, endLineNumber).join('\n');
     this.setState({currentTargetTableArea: {beginLineNumber, endLineNumber}});
     this.setState({currentTargetTableArea: {beginLineNumber, endLineNumber}});
     this.refs.handsontableModal.show(MarkdownTable.fromMarkdownString(tableLines));
     this.refs.handsontableModal.show(MarkdownTable.fromMarkdownString(tableLines));
   }
   }

+ 1 - 1
src/client/js/components/PageEditor/MarkdownTableUtil.js

@@ -170,7 +170,7 @@ class MarkdownTableUtil {
    * @param endLineNumber
    * @param endLineNumber
    */
    */
   replaceMarkdownTableInMarkdown(table, markdown, beginLineNumber, endLineNumber) {
   replaceMarkdownTableInMarkdown(table, markdown, beginLineNumber, endLineNumber) {
-    const splitMarkdown = markdown.split('\n');
+    const splitMarkdown = markdown.split(/\r\n|\r|\n/);
     const markdownBeforeTable = splitMarkdown.slice(0, beginLineNumber - 1);
     const markdownBeforeTable = splitMarkdown.slice(0, beginLineNumber - 1);
     const markdownAfterTable = splitMarkdown.slice(endLineNumber);
     const markdownAfterTable = splitMarkdown.slice(endLineNumber);