From 190b6edfb1e7b90ce39cbecc4647b5e607df1dbd Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Wed, 25 Nov 2015 08:50:56 +0900 Subject: [PATCH 01/14] =?UTF-8?q?Main=20window=E3=81=AE=20visible=20on=20a?= =?UTF-8?q?ll=20worpspace=E8=A7=A3=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- atom-lib/main-window.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/atom-lib/main-window.js b/atom-lib/main-window.js index cf5dc42c..710e6fd6 100644 --- a/atom-lib/main-window.js +++ b/atom-lib/main-window.js @@ -16,8 +16,6 @@ const url = path.resolve(__dirname, '../browser/main/index.html') mainWindow.loadURL('file://' + url) -mainWindow.setVisibleOnAllWorkspaces(true) - mainWindow.webContents.on('new-window', function (e) { e.preventDefault() }) From e9cfb2c4ee6afe62fb85b378507a2f1aebfd47c5 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Wed, 25 Nov 2015 08:59:43 +0900 Subject: [PATCH 02/14] change tray menu label(Open Finder => Open FInder window) --- finder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/finder.js b/finder.js index 3ec97b6a..e0d12bf2 100755 --- a/finder.js +++ b/finder.js @@ -36,7 +36,7 @@ app.on('ready', function () { } })) trayMenu.append(new MenuItem({ - label: 'Open Finder', + label: 'Open Finder window', click: function () { finderWindow.show() } From 978d77142cb2d2a9940a69e48306d7b039218899 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Sun, 29 Nov 2015 11:05:18 +0900 Subject: [PATCH 03/14] Searchbar tooltip changed(add exact match) --- browser/main/HomePage/ArticleTopBar.js | 7 +++++-- .../main/HomeContainer/components/ArticleTopBar.styl | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/browser/main/HomePage/ArticleTopBar.js b/browser/main/HomePage/ArticleTopBar.js index 62880bc7..03efb5d9 100644 --- a/browser/main/HomePage/ArticleTopBar.js +++ b/browser/main/HomePage/ArticleTopBar.js @@ -118,8 +118,11 @@ export default class ArticleTopBar extends React.Component { : null }
- - Search by tag : #{'{string}'}
- - Search by folder : /{'{folder_name}'} +
    +
  • - Search by tag : #{'{string}'}
    • +
  • - Search by folder : /{'{folder_name}'}
    • +
  • exact match : //{'{folder_name}'}
    • +
diff --git a/browser/styles/main/HomeContainer/components/ArticleTopBar.styl b/browser/styles/main/HomeContainer/components/ArticleTopBar.styl index 1d53d822..afad46a9 100644 --- a/browser/styles/main/HomeContainer/components/ArticleTopBar.styl +++ b/browser/styles/main/HomeContainer/components/ArticleTopBar.styl @@ -62,6 +62,13 @@ infoBtnActiveBgColor = #3A3A3A opacity 1 &.hide opacity 0 + ul + li:last-child + line-height 10px + margin-bottom 3px + small + font-size 10px + margin-left 15px input absolute top left width 350px From 91eb7feb3c736aca1c79aaa4e04bafe6e2177b87 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Sun, 29 Nov 2015 11:08:13 +0900 Subject: [PATCH 04/14] =?UTF-8?q?Finder=E3=81=AEvisibile=20on=20all=20work?= =?UTF-8?q?spaces=E8=A7=A3=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- atom-lib/finder-window.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/atom-lib/finder-window.js b/atom-lib/finder-window.js index 466c40b5..01bc6eac 100644 --- a/atom-lib/finder-window.js +++ b/atom-lib/finder-window.js @@ -25,6 +25,4 @@ finderWindow.on('blur', function () { finderWindow.hide() }) -finderWindow.setVisibleOnAllWorkspaces(true) - module.exports = finderWindow From 2bbb5ef74e43c30c4a3648adab0d1420d07a87b3 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Sun, 29 Nov 2015 18:57:49 +0900 Subject: [PATCH 05/14] =?UTF-8?q?article=E3=81=AE=E3=82=BF=E3=82=A4?= =?UTF-8?q?=E3=83=88=E3=83=AB=E3=81=AE=E5=9F=BA=E6=9C=AC=E3=82=BF=E3=82=A4?= =?UTF-8?q?=E3=83=88=E3=83=AB=E8=BF=BD=E5=8A=A0=20/=20=E4=BD=95=E3=82=82?= =?UTF-8?q?=E6=9B=B8=E3=81=8B=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?= =?UTF-8?q?=E6=99=82=E3=81=ABUntitled=20label=E3=82=92=E3=81=A0=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- browser/main/HomePage/ArticleDetail.js | 13 ++++++++++++- browser/main/HomePage/ArticleList.js | 8 +++++++- .../main/HomeContainer/components/ArticleList.styl | 2 ++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/browser/main/HomePage/ArticleDetail.js b/browser/main/HomePage/ArticleDetail.js index c7daaa9e..60d51433 100644 --- a/browser/main/HomePage/ArticleDetail.js +++ b/browser/main/HomePage/ArticleDetail.js @@ -267,6 +267,9 @@ export default class ArticleDetail extends React.Component { newArticle.updatedAt = new Date() if (newArticle.createdAt == null) { newArticle.createdAt = new Date() + if (newArticle.title.trim().length === 0) { + newArticle.title = `Created at ${moment(newArticle.createdAt).format('YYYY/MM/DD HH:mm')}` + } activityRecord.emit('ARTICLE_CREATE') } else { activityRecord.emit('ARTICLE_UPDATE') @@ -464,7 +467,15 @@ export default class ArticleDetail extends React.Component {
- this.handleTitleKeyDown(e)} placeholder='Title' ref='title' value={this.state.article.title} onChange={e => this.handleTitleChange(e)}/> + this.handleTitleKeyDown(e)} + placeholder={this.state.article.createdAt == null + ? `Created at ${moment().format('YYYY/MM/DD HH:mm')}` + : 'Title'} + ref='title' + value={this.state.article.title} + onChange={e => this.handleTitleChange(e)} + />
Not tagged yet) let folder = _.findWhere(folders, {key: article.FolderKey}) + let title = article.status !== NEW + ? article.title.trim().length === 0 + ? (Untitled) + : article.title + : '(New article)' + return (
this.handleArticleClick(article)(e)} className={'articleItem' + (activeArticle.key === article.key ? ' active' : '')}> @@ -91,7 +97,7 @@ export default class ArticleList extends React.Component { {article.status != null ? article.status : moment(article.updatedAt).fromNow()}
-
{article.status !== NEW ? article.title : '(New article)'}
+
{title}
{tagElements}
diff --git a/browser/styles/main/HomeContainer/components/ArticleList.styl b/browser/styles/main/HomeContainer/components/ArticleList.styl index 6617773a..7d406c25 100644 --- a/browser/styles/main/HomeContainer/components/ArticleList.styl +++ b/browser/styles/main/HomeContainer/components/ArticleList.styl @@ -48,6 +48,8 @@ articleItemColor = #777 left 19px right 0 overflow ellipsis + small + color #AAA .bottom padding 5px 0 overflow-x auto From 04036e5c870d444edf3637bd569712b4394efbca Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Mon, 30 Nov 2015 03:44:58 +0900 Subject: [PATCH 06/14] =?UTF-8?q?=E6=96=B0=E8=A6=8F=E6=8A=95=E7=A8=BF=20Cm?= =?UTF-8?q?d=20+=20n=20/=20Preview=20Cmd=20+=20P=20=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- browser/main/HomePage.js | 16 ++++++++++++---- browser/main/HomePage/ArticleDetail.js | 4 +++- browser/main/HomePage/ArticleNavigator.js | 3 ++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/browser/main/HomePage.js b/browser/main/HomePage.js index b7880825..69c65948 100644 --- a/browser/main/HomePage.js +++ b/browser/main/HomePage.js @@ -1,6 +1,6 @@ import React, { PropTypes} from 'react' import { connect } from 'react-redux' -import { CREATE_MODE, EDIT_MODE, IDLE_MODE, NEW, toggleTutorial } from 'boost/actions' +import { EDIT_MODE, IDLE_MODE, NEW, toggleTutorial } from 'boost/actions' // import UserNavigator from './HomePage/UserNavigator' import ArticleNavigator from './HomePage/ArticleNavigator' import ArticleTopBar from './HomePage/ArticleTopBar' @@ -57,7 +57,7 @@ class HomePage extends React.Component { } switch (status.mode) { - case CREATE_MODE: + case EDIT_MODE: if (e.keyCode === 27) { detail.handleCancelButtonClick() @@ -65,6 +65,13 @@ class HomePage extends React.Component { if ((e.keyCode === 13 && e.metaKey) || (e.keyCode === 83 && e.metaKey)) { detail.handleSaveButtonClick() } + if (e.keyCode === 80 && e.metaKey) { + detail.handleTogglePreviewButtonClick() + } + if (e.keyCode === 78 && e.metaKey) { + nav.handleNewPostButtonClick() + e.preventDefault() + } break case IDLE_MODE: if (e.keyCode === 69) { @@ -99,7 +106,7 @@ class HomePage extends React.Component { list.selectNextArticle() } - if (e.keyCode === 65 || e.keyCode === 13 && e.metaKey) { + if (e.keyCode === 65 || (e.keyCode === 13 && e.metaKey) || (e.keyCode === 78 && e.metaKey)) { nav.handleNewPostButtonClick() e.preventDefault() } @@ -257,7 +264,8 @@ HomePage.propTypes = { folder: PropTypes.array, tag: PropTypes.array, text: PropTypes.array - }) + }), + tags: PropTypes.array } export default connect(remap)(HomePage) diff --git a/browser/main/HomePage/ArticleDetail.js b/browser/main/HomePage/ArticleDetail.js index 60d51433..d77041c7 100644 --- a/browser/main/HomePage/ArticleDetail.js +++ b/browser/main/HomePage/ArticleDetail.js @@ -411,7 +411,9 @@ export default class ArticleDetail extends React.Component { } handleTogglePreviewButtonClick (e) { - this.setState({previewMode: !this.state.previewMode}) + if (this.state.article.mode === 'markdown') { + this.setState({previewMode: !this.state.previewMode}) + } } handleTitleKeyDown (e) { diff --git a/browser/main/HomePage/ArticleNavigator.js b/browser/main/HomePage/ArticleNavigator.js index f3721e60..269d528f 100644 --- a/browser/main/HomePage/ArticleNavigator.js +++ b/browser/main/HomePage/ArticleNavigator.js @@ -1,6 +1,6 @@ import React, { PropTypes } from 'react' import { findWhere } from 'lodash' -import { setSearchFilter, switchFolder, switchMode, switchArticle, updateArticle, EDIT_MODE } from 'boost/actions' +import { setSearchFilter, switchFolder, switchMode, switchArticle, updateArticle, clearNewArticle, EDIT_MODE } from 'boost/actions' import { openModal } from 'boost/modal' import FolderMark from 'boost/components/FolderMark' import Preferences from 'boost/components/modal/Preferences' @@ -85,6 +85,7 @@ export default class ArticleNavigator extends React.Component { status: 'NEW' } + dispatch(clearNewArticle()) dispatch(updateArticle(newArticle)) dispatch(switchArticle(newArticle.key, true)) dispatch(switchMode(EDIT_MODE)) From 15a50ef452d703bd38ff37af3a2a9fc8404b0509 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Mon, 30 Nov 2015 04:17:52 +0900 Subject: [PATCH 07/14] =?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 From a7096aa89f22b5338a43116b50eaffc4b0d58fbb Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Mon, 30 Nov 2015 04:28:23 +0900 Subject: [PATCH 08/14] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92?= =?UTF-8?q?=E7=B6=BA=E9=BA=97=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- browser/main/HomePage/ArticleDetail.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/browser/main/HomePage/ArticleDetail.js b/browser/main/HomePage/ArticleDetail.js index 39ccd8cb..311ac7cf 100644 --- a/browser/main/HomePage/ArticleDetail.js +++ b/browser/main/HomePage/ArticleDetail.js @@ -464,11 +464,21 @@ export default class ArticleDetail extends React.Component {
{ this.state.article.mode === 'markdown' - ? () + ? () : null } - - + +
From 65c78df6717147f68d1e2913f9c3c490d447d041 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Mon, 30 Nov 2015 11:14:16 +0900 Subject: [PATCH 09/14] =?UTF-8?q?External=20link=E7=94=A8=E3=81=AEDropdown?= =?UTF-8?q?=20menu=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- browser/main/HomePage/ArticleTopBar.js | 44 +++++++++++++++++-- .../components/ArticleTopBar.styl | 26 ++++++++--- 2 files changed, 61 insertions(+), 9 deletions(-) diff --git a/browser/main/HomePage/ArticleTopBar.js b/browser/main/HomePage/ArticleTopBar.js index 03efb5d9..36fbcf35 100644 --- a/browser/main/HomePage/ArticleTopBar.js +++ b/browser/main/HomePage/ArticleTopBar.js @@ -35,7 +35,8 @@ export default class ArticleTopBar extends React.Component { super(props) this.state = { - isTooltipHidden: true + isTooltipHidden: true, + isLinksDropdownOpen: false } } @@ -96,6 +97,28 @@ export default class ArticleTopBar extends React.Component { dispatch(toggleTutorial()) } + handleLinksDropdownClick (e) { + e.preventDefault() + let linksButton = document.activeElement + this.handleLinksDropdownClickHandler = e => { + if (linksButton !== document.activeElement) { + console.log('hide dropdown') + document.removeEventListener('click', this.handleLinksDropdownClickHandler) + this.setState({ + isLinksDropdownOpen: false + }) + } + } + + if (!this.state.isLinksDropdownOpen) { + document.removeEventListener('click', this.handleLinksDropdownClickHandler) + document.addEventListener('click', this.handleLinksDropdownClickHandler) + this.setState({ + isLinksDropdownOpen: true + }) + } + } + render () { let { status } = this.props return ( @@ -132,10 +155,23 @@ export default class ArticleTopBar extends React.Component {
- + this.handleLinksDropdownClick(e)} href> - Boost official page - + + { + this.state.isLinksDropdownOpen + ? ( +
+ + Boost official page + + + Discuss + +
+ ) + : null + }
{status.isTutorialOpen ? ( diff --git a/browser/styles/main/HomeContainer/components/ArticleTopBar.styl b/browser/styles/main/HomeContainer/components/ArticleTopBar.styl index afad46a9..6397e74a 100644 --- a/browser/styles/main/HomeContainer/components/ArticleTopBar.styl +++ b/browser/styles/main/HomeContainer/components/ArticleTopBar.styl @@ -147,17 +147,33 @@ infoBtnActiveBgColor = #3A3A3A .tooltip opacity 1 - &>.logo + &>.linksBtn display block position absolute top 8px right 15px opacity 0.7 - .tooltip - tooltip() - margin-top 44px - margin-left -120px &:hover opacity 1 .tooltip opacity 1 + &>.links-dropdown + position fixed + z-index 50 + right 10px + top 40px + background-color transparentify(invBackgroundColor, 80%) + padding 5px 0 + .links-item + padding 0 10px + height 33px + width 100% + display block + line-height 33px + text-decoration none + color white + &:hover + background-color transparentify(lighten(invBackgroundColor, 30%), 80%) + + + From eba19468d5c029ab8d142e373592a38eec416369 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Mon, 30 Nov 2015 12:53:21 +0900 Subject: [PATCH 10/14] add copy button --- browser/main/HomePage/ArticleDetail.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/browser/main/HomePage/ArticleDetail.js b/browser/main/HomePage/ArticleDetail.js index 311ac7cf..4a4b7f0d 100644 --- a/browser/main/HomePage/ArticleDetail.js +++ b/browser/main/HomePage/ArticleDetail.js @@ -25,6 +25,9 @@ import TagSelect from 'boost/components/TagSelect' import ModeSelect from 'boost/components/ModeSelect' import activityRecord from 'boost/activityRecord' +const electron = require('electron') +const clipboard = electron.clipboard + const BRAND_COLOR = '#18AF90' const editDeleteTutorialElement = ( @@ -84,6 +87,10 @@ const modeSelectTutorialElement = ( ) +function notify (...args) { + return new window.Notification(...args) +} + function makeInstantArticle (article) { return Object.assign({}, article) } @@ -154,6 +161,13 @@ export default class ArticleDetail extends React.Component { ) } + handleClipboardButtonClick (e) { + clipboard.writeText(this.props.activeArticle.content) + notify('Saved to Clipboard!', { + body: 'Paste it wherever you want!' + }) + } + handleEditButtonClick (e) { let { dispatch } = this.props dispatch(switchMode(EDIT_MODE)) @@ -219,6 +233,9 @@ export default class ArticleDetail extends React.Component {
{tags}
+ From de83447cb375ffdb1b6003f2265b48cd2fb19c92 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Mon, 30 Nov 2015 12:53:46 +0900 Subject: [PATCH 11/14] =?UTF-8?q?External=20link=E5=8B=95=E3=81=8DDebug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- browser/main/HomePage/ArticleTopBar.js | 44 +++++++++++--------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/browser/main/HomePage/ArticleTopBar.js b/browser/main/HomePage/ArticleTopBar.js index 36fbcf35..bcfba047 100644 --- a/browser/main/HomePage/ArticleTopBar.js +++ b/browser/main/HomePage/ArticleTopBar.js @@ -42,12 +42,26 @@ export default class ArticleTopBar extends React.Component { componentDidMount () { this.searchInput = ReactDOM.findDOMNode(this.refs.searchInput) + this.linksButton = ReactDOM.findDOMNode(this.refs.links) + this.showLinksDropdown = e => { + e.preventDefault() + e.stopPropagation() + if (!this.state.isLinksDropdownOpen) { + this.setState({isLinksDropdownOpen: true}) + } + } + this.linksButton.addEventListener('click', this.showLinksDropdown) + this.hideLinksDropdown = e => { + if (this.state.isLinksDropdownOpen) { + this.setState({isLinksDropdownOpen: false}) + } + } + document.addEventListener('click', this.hideLinksDropdown) } componentWillUnmount () { - this.searchInput.removeEventListener('keydown', this.showTooltip) - this.searchInput.removeEventListener('focus', this.showTooltip) - this.searchInput.removeEventListener('blur', this.showTooltip) + document.removeEventListener('click', this.hideLinksDropdown) + this.linksButton.removeEventListener('click', this.showLinksDropdown()) } handleTooltipRequest (e) { @@ -97,28 +111,6 @@ export default class ArticleTopBar extends React.Component { dispatch(toggleTutorial()) } - handleLinksDropdownClick (e) { - e.preventDefault() - let linksButton = document.activeElement - this.handleLinksDropdownClickHandler = e => { - if (linksButton !== document.activeElement) { - console.log('hide dropdown') - document.removeEventListener('click', this.handleLinksDropdownClickHandler) - this.setState({ - isLinksDropdownOpen: false - }) - } - } - - if (!this.state.isLinksDropdownOpen) { - document.removeEventListener('click', this.handleLinksDropdownClickHandler) - document.addEventListener('click', this.handleLinksDropdownClickHandler) - this.setState({ - isLinksDropdownOpen: true - }) - } - } - render () { let { status } = this.props return ( @@ -155,7 +147,7 @@ export default class ArticleTopBar extends React.Component {
- this.handleLinksDropdownClick(e)} href> + { From 57998ba727fbdc659b00d809b8e8362a76afbec7 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Mon, 30 Nov 2015 16:22:10 +0900 Subject: [PATCH 12/14] =?UTF-8?q?=E7=B7=A8=E9=9B=86=E8=AD=A6=E5=91=8A?= =?UTF-8?q?=E3=81=8C=E5=87=BA=E3=81=A6=E3=81=84=E3=82=8B=E6=99=82=E3=81=AB?= =?UTF-8?q?Code=20editor=E3=81=8C=E3=82=AD=E3=83=BC=E5=85=A5=E5=8A=9B?= =?UTF-8?q?=E3=82=92=E8=AA=8D=E8=AD=98=E3=81=99=E3=82=8B=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E8=A7=A3=E6=B1=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/HomeContainer/components/ArticleNavigator.styl | 2 +- lib/components/modal/EditedAlert.js | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/browser/styles/main/HomeContainer/components/ArticleNavigator.styl b/browser/styles/main/HomeContainer/components/ArticleNavigator.styl index af61cf3d..93fd515f 100644 --- a/browser/styles/main/HomeContainer/components/ArticleNavigator.styl +++ b/browser/styles/main/HomeContainer/components/ArticleNavigator.styl @@ -14,7 +14,7 @@ articleCount = #999 .userProfileName color brandColor font-size 28px - padding 6px 0 0 10px + padding 6px 37px 0 10px white-space nowrap text-overflow ellipsis overflow hidden diff --git a/lib/components/modal/EditedAlert.js b/lib/components/modal/EditedAlert.js index fd60258d..5b487bb3 100644 --- a/lib/components/modal/EditedAlert.js +++ b/lib/components/modal/EditedAlert.js @@ -1,8 +1,13 @@ import React, { PropTypes } from 'react' +import ReactDOM from 'react-dom' import store from 'boost/store' import { unlockStatus, clearNewArticle } from 'boost/actions' export default class EditedAlert extends React.Component { + componentDidMount () { + ReactDOM.findDOMNode(this.refs.no).focus() + } + handleNoButtonClick (e) { this.props.close() } @@ -22,8 +27,8 @@ export default class EditedAlert extends React.Component {
Do you really want to leave without finishing?
- - + +
) From 044877368226ed4b9b3d1a095e59da7f78579df7 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Mon, 30 Nov 2015 16:28:14 +0900 Subject: [PATCH 13/14] =?UTF-8?q?Folder=20create=20modal=E3=82=92=E5=87=BA?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=82=89=E3=80=81=E3=81=BE=E3=81=A3=E3=81=99?= =?UTF-8?q?=E3=81=90Name=20input=E3=82=92Focus=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/components/modal/CreateNewFolder.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/components/modal/CreateNewFolder.js b/lib/components/modal/CreateNewFolder.js index 2686dafe..616f7692 100644 --- a/lib/components/modal/CreateNewFolder.js +++ b/lib/components/modal/CreateNewFolder.js @@ -1,4 +1,5 @@ import React, { PropTypes } from 'react' +import ReactDOM from 'react-dom' import linkState from 'boost/linkState' import { createFolder } from 'boost/actions' import store from 'boost/store' @@ -15,6 +16,10 @@ export default class CreateNewFolder extends React.Component { } } + componentDidMount () { + ReactDOM.findDOMNode(this.refs.folderName).focus() + } + handleCloseButton (e) { this.props.close() } @@ -84,7 +89,7 @@ export default class CreateNewFolder extends React.Component {
Create new folder
- this.handleKeyDown(e)} className='ipt' type='text' valueLink={this.linkState('name')} placeholder='Enter folder name'/> + this.handleKeyDown(e)} className='ipt' type='text' valueLink={this.linkState('name')} placeholder='Enter folder name'/>
{colorElements}
From 96a868789654ecb66b9d6e75b71f3364f14ce863 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Mon, 30 Nov 2015 23:11:31 +0900 Subject: [PATCH 14/14] bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 41cdabfa..9a2a514f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "boost", - "version": "0.4.2-rc.0", + "version": "0.4.3-rc.0", "description": "Boost App", "main": "index.js", "scripts": {