Skip to content

No init on new config #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
avidanfeldman wants to merge 15 commits into from
Closed

No init on new config #51

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
70652da
fixed on order to support redux form
Nov 22, 2016
7977110
release v0.5.1
Nov 23, 2016
4de3a22
change log
Nov 23, 2016
a29800c
release v0.5.2
Nov 23, 2016
46d1955
cleanup
Nov 23, 2016
a56b712
Merge pull request #2 from SAManage/fix_react_tinymce_for_redux_form
Nov 23, 2016
f073b78
checking editor has serializer before calling to getContent
Nov 23, 2016
7d058fe
remove old react-tinymce files (replaced with react-tinymce-samanage)
Nov 23, 2016
2a03f52
Merge pull request #4 from SAManage/check_editor_before_get_content
nudelx Nov 23, 2016
7dc434a
release v0.5.3
Nov 24, 2016
c2d7bae
release v0.5.4
Nov 27, 2016
721530f
release v0.5.5
Nov 27, 2016
d3e55b2
release v0.5.5
Nov 27, 2016
25e9f7a
release v0.5.6
Nov 27, 2016
683b210
no need to init for config change (we don't change configuration)
Dec 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fixed on order to support redux form
  • Loading branch information
Avidan Feldman committed Nov 22, 2016
commit 70652da251a78e998bc9a42fb936cda756e0d434
16 changes: 12 additions & 4 deletions lib/components/TinyMCE.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,25 @@ const TinyMCE = React.createClass({
},

componentWillReceiveProps(nextProps) {
if (!isEqual(this.props.config, nextProps.config)) {
this._init(nextProps.config, nextProps.content);
}
if (!isEqual(this.props.id, nextProps.id)) {
this.id = nextProps.id;
}
if (!isEqual(this.props.config, nextProps.config) || !isEqual(this.props.id, nextProps.id)) {
this._init(clone(nextProps.config), nextProps.content);
return;
}

const editor = tinymce.EditorManager.get(this.id);
if (!isEqual(editor.getContent({format: 'html'}), nextProps.content)) {
editor.setContent(nextProps.content);

editor.selection.select(editor.getBody(), true);
editor.selection.collapse(false);
}
},

shouldComponentUpdate(nextProps) {
return (
!isEqual(this.props.content, nextProps.content) ||
!isEqual(this.props.config, nextProps.config)
);
},
Expand Down