From 034f46792bbb9f88b46e49b6ff0b9e077a5f735b Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Fri, 17 Mar 2017 03:42:17 +0900 Subject: [PATCH 1/4] ignore # in the code block --- browser/main/Detail/MarkdownNoteDetail.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 29504351..28a21423 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -65,12 +65,23 @@ class MarkdownNoteDetail extends React.Component { findTitle (value) { let splitted = value.split('\n') let title = null + let markdownInCode = false for (let i = 0; i < splitted.length; i++) { let trimmedLine = splitted[i].trim() - if (trimmedLine.match(/^# .+/)) { - title = trimmedLine.substring(1, trimmedLine.length).trim() - break + if (trimmedLine.match('```')){ + if (markdownInCode) { + markdownInCode = false + } else { + markdownInCode = true + } + } else { + if(!markdownInCode) { + if (trimmedLine.match(/^# +/)){ + title = trimmedLine.substring(1, trimmedLine.length).trim() + break + } + } } } From b577ca2bc25b5dfc82e1e502edec6475159544bb Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 18 Mar 2017 01:58:15 +0900 Subject: [PATCH 2/4] Refactor the dirty code --- browser/main/Detail/MarkdownNoteDetail.js | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 28a21423..5ac00ebc 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -65,22 +65,16 @@ class MarkdownNoteDetail extends React.Component { findTitle (value) { let splitted = value.split('\n') let title = null - let markdownInCode = false + let isMarkdownInCode = false for (let i = 0; i < splitted.length; i++) { let trimmedLine = splitted[i].trim() if (trimmedLine.match('```')){ - if (markdownInCode) { - markdownInCode = false - } else { - markdownInCode = true - } + isMarkdownInCode = !isMarkdownInCode } else { - if(!markdownInCode) { - if (trimmedLine.match(/^# +/)){ - title = trimmedLine.substring(1, trimmedLine.length).trim() - break - } + if(isMarkdownInCode === false && trimmedLine.match(/^# +/)) { + title = trimmedLine.substring(1, trimmedLine.length).trim() + break } } } From fe1c1971380c1b5466d542883dcb5e418e3a1dba Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 18 Mar 2017 03:02:04 +0900 Subject: [PATCH 3/4] reduce indent --- browser/main/Detail/MarkdownNoteDetail.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 5ac00ebc..2eceef43 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -71,8 +71,7 @@ class MarkdownNoteDetail extends React.Component { let trimmedLine = splitted[i].trim() if (trimmedLine.match('```')){ isMarkdownInCode = !isMarkdownInCode - } else { - if(isMarkdownInCode === false && trimmedLine.match(/^# +/)) { + } else if (isMarkdownInCode === false && trimmedLine.match(/^# +/)) { title = trimmedLine.substring(1, trimmedLine.length).trim() break } From 806c3bbaf97ec5c08c71147d56ab87600751ed5e Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Sat, 18 Mar 2017 12:27:43 +0900 Subject: [PATCH 4/4] delete unnecessary `}` and correct the indent --- browser/main/Detail/MarkdownNoteDetail.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 2eceef43..90f26286 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -69,12 +69,11 @@ class MarkdownNoteDetail extends React.Component { for (let i = 0; i < splitted.length; i++) { let trimmedLine = splitted[i].trim() - if (trimmedLine.match('```')){ + if (trimmedLine.match('```')) { isMarkdownInCode = !isMarkdownInCode } else if (isMarkdownInCode === false && trimmedLine.match(/^# +/)) { - title = trimmedLine.substring(1, trimmedLine.length).trim() - break - } + title = trimmedLine.substring(1, trimmedLine.length).trim() + break } }