From 6b8488ae0fefb2061c9be6b4e262e33269a5f00d Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Wed, 26 Apr 2017 18:14:29 +0900 Subject: [PATCH 1/6] fix the bug when using markdown syntax h1 --- browser/main/Detail/MarkdownNoteDetail.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 6cb0a4730..d23a9c83b 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -69,9 +69,10 @@ class MarkdownNoteDetail extends React.Component { for (let i = 0; i < splitted.length; i++) { let trimmedLine = splitted[i].trim() + let trimmedNextLine = splitted[i + 1].trim() if (trimmedLine.match('```')) { isMarkdownInCode = !isMarkdownInCode - } else if (isMarkdownInCode === false && trimmedLine.match(/^# +/)) { + } else if (isMarkdownInCode === false && (trimmedLine.match(/^# +/) || trimmedNextLine.match('='))) { title = trimmedLine.substring(1, trimmedLine.length).trim() break } From 11f7fcbaef4bd50738683bfb8c6413f2ad6520e2 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Wed, 26 Apr 2017 18:32:46 +0900 Subject: [PATCH 2/6] fix the bug that is markdown titile starts with second letter --- browser/main/Detail/MarkdownNoteDetail.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index d23a9c83b..dd3744db8 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -73,7 +73,11 @@ class MarkdownNoteDetail extends React.Component { if (trimmedLine.match('```')) { isMarkdownInCode = !isMarkdownInCode } else if (isMarkdownInCode === false && (trimmedLine.match(/^# +/) || trimmedNextLine.match('='))) { - title = trimmedLine.substring(1, trimmedLine.length).trim() + if (trimmedNextLine.match('=')) { + title = trimmedLine.substring(0, trimmedLine.length).trim() + } else { + title = trimmedLine.substring(1, trimmedLine.length).trim() + } break } } From 2ed092279de5e658c356ac5ad6afe6ae030cfc48 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Thu, 18 May 2017 00:07:48 +0900 Subject: [PATCH 3/6] avoid undefined --- browser/main/Detail/MarkdownNoteDetail.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index dd3744db8..45f0442f0 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -66,10 +66,10 @@ class MarkdownNoteDetail extends React.Component { let splitted = value.split('\n') let title = null let isMarkdownInCode = false - +1 for (let i = 0; i < splitted.length; i++) { let trimmedLine = splitted[i].trim() - let trimmedNextLine = splitted[i + 1].trim() + let trimmedNextLine = typeof splitted[i + 1] === 'undefined' ? '' : splitted[i + 1].trim() if (trimmedLine.match('```')) { isMarkdownInCode = !isMarkdownInCode } else if (isMarkdownInCode === false && (trimmedLine.match(/^# +/) || trimmedNextLine.match('='))) { From 7265f767707d77417345a8f1660ac8b3d5ea2459 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Thu, 18 May 2017 00:31:46 +0900 Subject: [PATCH 4/6] for loop change to forEach --- browser/main/Detail/MarkdownNoteDetail.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 45f0442f0..3923eaefe 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -66,10 +66,10 @@ class MarkdownNoteDetail extends React.Component { let splitted = value.split('\n') let title = null let isMarkdownInCode = false -1 - for (let i = 0; i < splitted.length; i++) { - let trimmedLine = splitted[i].trim() - let trimmedNextLine = typeof splitted[i + 1] === 'undefined' ? '' : splitted[i + 1].trim() + + splitted.forEach((line, index) => { + let trimmedLine = line.trim() + let trimmedNextLine = typeof splitted[index + 1] === 'undefined' ? '' : splitted[index + 1].trim() if (trimmedLine.match('```')) { isMarkdownInCode = !isMarkdownInCode } else if (isMarkdownInCode === false && (trimmedLine.match(/^# +/) || trimmedNextLine.match('='))) { @@ -78,9 +78,9 @@ class MarkdownNoteDetail extends React.Component { } else { title = trimmedLine.substring(1, trimmedLine.length).trim() } - break + return } - } + }) if (title == null) { for (let i = 0; i < splitted.length; i++) { From a528c99900d90f2bbb358f9bc815962bb4046a3e Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 20 May 2017 12:24:58 +0900 Subject: [PATCH 5/6] change from 'undefined' to undefined --- browser/main/Detail/MarkdownNoteDetail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 3923eaefe..2161cbece 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -69,7 +69,7 @@ class MarkdownNoteDetail extends React.Component { splitted.forEach((line, index) => { let trimmedLine = line.trim() - let trimmedNextLine = typeof splitted[index + 1] === 'undefined' ? '' : splitted[index + 1].trim() + let trimmedNextLine = splitted[index + 1] === undefined ? '' : splitted[index + 1].trim() if (trimmedLine.match('```')) { isMarkdownInCode = !isMarkdownInCode } else if (isMarkdownInCode === false && (trimmedLine.match(/^# +/) || trimmedNextLine.match('='))) { From 575f1b4b337ba958a8acc4379ffe6244a00f1d02 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 20 May 2017 12:28:11 +0900 Subject: [PATCH 6/6] change from forEach to some --- browser/main/Detail/MarkdownNoteDetail.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 2161cbece..53736b4ac 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -67,7 +67,7 @@ class MarkdownNoteDetail extends React.Component { let title = null let isMarkdownInCode = false - splitted.forEach((line, index) => { + splitted.some((line, index) => { let trimmedLine = line.trim() let trimmedNextLine = splitted[index + 1] === undefined ? '' : splitted[index + 1].trim() if (trimmedLine.match('```')) { @@ -78,7 +78,7 @@ class MarkdownNoteDetail extends React.Component { } else { title = trimmedLine.substring(1, trimmedLine.length).trim() } - return + return true } })