1
0
mirror of https://github.com/BoostIo/Boostnote synced 2026-01-30 17:17:17 +00:00

#14 改善適用

- アプリが立ち上がったら最初はmy planetが表示されるようにしたい
- Noteがスクロールできない
- Note行間がなくて読みづらい
This commit is contained in:
Rokt33r
2015-08-23 00:52:03 +09:00
parent da066fe694
commit 04060ce252
7 changed files with 36 additions and 31 deletions

View File

@@ -6,6 +6,7 @@ module.exports = React.createClass({
propTypes: {
code: React.PropTypes.string,
mode: React.PropTypes.string,
className: React.PropTypes.string,
onChange: React.PropTypes.func
},
componentDidMount: function () {
@@ -52,7 +53,7 @@ module.exports = React.createClass({
},
render: function () {
return (
<div ref='target'></div>
<div ref='target' className={this.props.className}></div>
)
}
})

View File

@@ -5,7 +5,8 @@ var ace = window.ace
module.exports = React.createClass({
propTypes: {
code: React.PropTypes.string,
mode: React.PropTypes.string
mode: React.PropTypes.string,
className: React.PropTypes.string
},
componentDidMount: function () {
var el = React.findDOMNode(this.refs.target)
@@ -46,7 +47,7 @@ module.exports = React.createClass({
},
render: function () {
return (
<div ref='target'></div>
<div ref='target' className={this.props.className}></div>
)
}
})

View File

@@ -81,9 +81,7 @@ module.exports = React.createClass({
</span>
</div>
<div className='detailBody'>
<div className='content'>
<CodeViewer code={article.content} mode={article.mode}/>
</div>
<CodeViewer className='content' code={article.content} mode={article.mode}/>
</div>
</div>
)

View File

@@ -16,6 +16,10 @@ module.exports = React.createClass({
componentDidMount: function () {
if (this.isActive('homeEmpty')) {
var user = JSON.parse(localStorage.getItem('currentUser'))
if (user.Planets != null && user.Planets.length > 0) {
this.transitionTo('planet', {userName: user.name, planetName: user.Planets[0].name})
return
}
this.transitionTo('userHome', {userName: user.name})
}
},

View File

@@ -20,13 +20,9 @@ var KeyStore = Reflux.createStore({
if (typeof cb === 'function') cb()
},
onKeyDown: function (e) {
console.log(e.keyCode)
console.log(state)
/*
Modals
*/
if (state.codeForm || state.noteForm || state.noteDeleteModal || state.codeDeleteModal || state.addMemberModal || state.aboutModal || state.editProfileModal || state.contactModal || state.teamCreateModal || state.planetCreateModal || state.planetSettingModal || state.teamSettingsModal || state.logoutModal) {
// ESC
if (e.keyCode === 27) this.cast('closeModal')