knadh/listmonk
1
1
Fork 0
mirror of https://github.com/knadh/listmonk.git synced 2024-11-10 17:13:04 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix content tab redirection on campaign creation

Browse source
This commit is contained in:
Kailash Nadh 2018-11-28 14:17:02 +05:30
parent c24c19b120
commit ca19b50126
3 changed files with 39 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
frontend/my/src/Campaign.js
View file

@ -128,9 +128,12 @@ class Editor extends React.PureComponent {
modules={ this.quillModules }
defaultValue={ this.props.record.body }
ref={ (o) => {
if(o) {
this.setState({ quill: o })
if(!o) {
return
}
this.setState({ quill: o })
document.querySelector(".ql-editor").focus()
}}
onChange={ () => {
if(!this.state.quill) {
@ -218,10 +221,7 @@ class TheFormDef extends React.PureComponent {
message: "Campaign created",
description: `"${values["name"]}" created` })
this.props.route.history.push(cs.Routes.ViewCampaign.replace(":id", resp.data.data.id))
this.props.fetchRecord(resp.data.data.id)
this.props.setCurrentTab("content")
this.setState({ loading: false })
this.props.route.history.push(cs.Routes.ViewCampaign.replace(":id", resp.data.data.id) + "#content")
}).catch(e => {
notification["error"]({ placement: cs.MsgPosition, message: "Error", description: e.message })
this.setState({ loading: false })
@ -428,6 +428,11 @@ class Campaign extends React.PureComponent {
} else {
this.setState({ loading: false })
}
// Content tab?
if(document.location.hash === "#content") {
this.setCurrentTab("content")
}
}
fetchRecord = (id) => {
@ -498,22 +503,29 @@ class Campaign extends React.PureComponent {
</Spin>
</Tabs.TabPane>
<Tabs.TabPane tab="Content" disabled={ this.state.record.id ? false : true } key="content">
<Editor { ...this.props }
ref={ (e) => {
// Take the editor's reference and save it in the state
// so that it's insertMedia() function can be passed to <Media />
this.setState({ editor: e })
}}
isSingle={ this.state.record.id ? true : false }
record={ this.state.record }
visible={ this.state.editorVisible }
toggleMedia={ this.toggleMedia }
setContent={ this.setContent }
formDisabled={ this.state.formDisabled }
/>
<div className="content-actions">
<p><Button icon="search" onClick={() => this.handlePreview(this.state.record)}>Preview</Button></p>
</div>
{ this.state.record.id &&
<div>
<Editor { ...this.props }
ref={ (e) => {
// Take the editor's reference and save it in the state
// so that it's insertMedia() function can be passed to <Media />
this.setState({ editor: e })
}}
isSingle={ this.state.record.id ? true : false }
record={ this.state.record }
visible={ this.state.editorVisible }
toggleMedia={ this.toggleMedia }
setContent={ this.setContent }
formDisabled={ this.state.formDisabled }
/>
<div className="content-actions">
<p><Button icon="search" onClick={() => this.handlePreview(this.state.record)}>Preview</Button></p>
</div>
</div>
}
{ !this.state.record.id &&
<Spin className="empty-spinner"></Spin>
}
</Tabs.TabPane>
</Tabs>

2
frontend/my/src/ModalPreview.js
View file

@ -30,7 +30,7 @@ class ModalPreview extends React.PureComponent {
onOk={ this.props.onCancel }>
<div className="preview-iframe-container">
<Spin className="preview-iframe-spinner"></Spin>
<iframe key="xxxxxxxxx" onLoad={() => {
<iframe key="preview-iframe" onLoad={() => {
// If state is used to manage the spinner, it causes
// the iframe to re-render and reload everything.
// Hack the spinner away from the DOM directly instead.

4
frontend/my/src/index.css
View file

@ -40,6 +40,10 @@ hr {
display: none;
}
.empty-spinner {
padding: 30px !important;
}
/* Layout */
body {
margin: 0;