From 15a50ef452d703bd38ff37af3a2a9fc8404b0509 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Mon, 30 Nov 2015 04:17:52 +0900 Subject: [PATCH] =?UTF-8?q?Title=E3=81=8C=E3=81=AA=E3=81=8B=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E3=82=89=E7=81=B0=E8=89=B2=E3=81=A7Untitle=E3=81=A8?= =?UTF-8?q?=E5=87=BA=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- browser/main/HomePage/ArticleDetail.js | 10 ++++++++-- .../main/HomeContainer/components/ArticleDetail.styl | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/browser/main/HomePage/ArticleDetail.js b/browser/main/HomePage/ArticleDetail.js index d77041c7..39ccd8cb 100644 --- a/browser/main/HomePage/ArticleDetail.js +++ b/browser/main/HomePage/ArticleDetail.js @@ -185,8 +185,13 @@ export default class ArticleDetail extends React.Component { : ( Not tagged yet ) : null + let folder = _.findWhere(folders, {key: activeArticle.FolderKey}) + let title = activeArticle.title.trim().length === 0 + ? (Untitled) + : activeArticle.title + return (
{this.state.openDeleteConfirmMenu @@ -232,7 +237,7 @@ export default class ArticleDetail extends React.Component {
-
{activeArticle.title}
+
{title}
{activeArticle.mode === 'markdown' ? @@ -265,9 +270,10 @@ export default class ArticleDetail extends React.Component { delete newArticle.status newArticle.updatedAt = new Date() + newArticle.title = newArticle.title.trim() if (newArticle.createdAt == null) { newArticle.createdAt = new Date() - if (newArticle.title.trim().length === 0) { + if (newArticle.title.length === 0) { newArticle.title = `Created at ${moment(newArticle.createdAt).format('YYYY/MM/DD HH:mm')}` } activityRecord.emit('ARTICLE_CREATE') diff --git a/browser/styles/main/HomeContainer/components/ArticleDetail.styl b/browser/styles/main/HomeContainer/components/ArticleDetail.styl index 2f4ae10c..e64e5da6 100644 --- a/browser/styles/main/HomeContainer/components/ArticleDetail.styl +++ b/browser/styles/main/HomeContainer/components/ArticleDetail.styl @@ -323,7 +323,8 @@ iptFocusBorderColor = #369DCD right 15px font-size 24px line-height 60px - white-space nowrap overflow-x auto overflow-y hidden + small + color #AAA