random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Progress

Browse Source
This commit is contained in:
mgabdev
2020-05-14 23:36:10 -04:00
parent a1977ba450
commit 805012ab72
13 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/gabsocial/features/compose/components/compose_form.js
View File

@@ -41,6 +41,10 @@ export default
@injectIntl
class ComposeForm extends ImmutablePureComponent {
static contextTypes = {
router: PropTypes.object,
}
state = {
composeFocused: false,
}

7
app/javascript/gabsocial/features/compose/containers/compose_form_container.js
View File

@@ -28,6 +28,9 @@ const mapStateToProps = (state, { replyToId, isStandalone }) => {
if (isModalOpen) isMatch = true
// console.log("isMatch:", isMatch, reduxReplyToId, replyToId, state.getIn(['compose', 'text']))
// console.log("reduxReplyToId:", reduxReplyToId, isModalOpen, isStandalone)
if (!isMatch) {
return {
isMatch,
@@ -81,10 +84,10 @@ const mapStateToProps = (state, { replyToId, isStandalone }) => {
}
}
const mapDispatchToProps = (dispatch, { reduxReplyToId, replyToId }) => ({
const mapDispatchToProps = (dispatch, { reduxReplyToId, replyToId, isStandalone }) => ({
onChange(text, markdown, newReplyToId) {
dispatch(changeCompose(text, markdown, newReplyToId))
dispatch(changeCompose(text, markdown, newReplyToId, isStandalone))
},
onSubmit(group, replyToId, router) {

2
app/javascript/gabsocial/features/list_timeline.js
View File

@@ -71,7 +71,7 @@ class ListTimeline extends ImmutablePureComponent {
}
handleEditClick = () => {
console.log("handleEditClick:", this.props.params.id)
// console.log("handleEditClick:", this.props.params.id)
this.props.dispatch(openModal('LIST_EDITOR', { id: this.props.params.id }))
}

2
app/javascript/gabsocial/features/notifications.js
View File

@@ -117,7 +117,7 @@ class Notifications extends ImmutablePureComponent {
// : todo : include follow requests
console.log('--0--notifications:', hasMore)
// console.log('--0--notifications:', hasMore)
if (isLoading && this.scrollableContent) {
scrollableContent = this.scrollableContent

2
app/javascript/gabsocial/features/search.js
View File

@@ -37,7 +37,7 @@ class Search extends ImmutablePureComponent {
const { results, location } = this.props
const { isSmallScreen } = this.state
console.log("results:", results)
// console.log("results:", results)
if (results.isEmpty() && isSmallScreen) {
return null

2
app/javascript/gabsocial/features/ui/ui.js
View File

@@ -146,7 +146,7 @@ class SwitchingArea extends PureComponent {
<Redirect from='/' to='/home' exact />
<WrappedRoute path='/home' exact page={HomePage} component={HomeTimeline} content={children} />
<WrappedRoute path='/compose' exact page={BasicPage} component={Compose} content={children} componentParams={{ title: 'Gab' }} />
<WrappedRoute path='/compose' exact page={BasicPage} component={Compose} content={children} componentParams={{ title: 'Compose' }} />
<WrappedRoute path='/timeline/all' exact page={CommunityPage} component={CommunityTimeline} content={children} componentParams={{ title: 'Community Feed' }} />