Skip to content

fixed on order to support redux form #2

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

Merged
avidanfeldman merged 5 commits into from
Nov 23, 2016
Merged

fixed on order to support redux form #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 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
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
24 changes: 15 additions & 9 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,31 @@
v0.5.2 - Wed, 23 Nov 2016 07:11:28 GMT
--------------------------------------

- added support for content update via redux form


v0.5.1 - Thu, 21 Apr 2016 00:17:15 GMT
--------------------------------------

-
-


v0.5.0 - Thu, 21 Apr 2016 00:16:59 GMT
--------------------------------------

-
-


v0.5.0 - Wed, 20 Apr 2016 22:54:27 GMT
--------------------------------------

-
-


v0.4.0 - Thu, 05 Nov 2015 22:24:52 GMT
--------------------------------------

-
-


v0.3.1 - Fri, 23 Oct 2015 22:48:23 GMT
Expand All @@ -38,25 +44,25 @@ v0.3.0 - Thu, 22 Oct 2015 08:40:36 GMT
v0.2.3 - Fri, 24 Jul 2015 00:47:50 GMT
--------------------------------------

-
-


v0.2.2 - Tue, 30 Jun 2015 17:28:40 GMT
--------------------------------------

-
-


v0.2.1 - Thu, 18 Jun 2015 19:14:33 GMT
--------------------------------------

-
-


v0.2.0 - Tue, 16 Jun 2015 22:54:31 GMT
--------------------------------------

-
-


v0.1.1 - Fri, 12 Jun 2015 21:14:13 GMT
Expand All @@ -68,6 +74,6 @@ v0.1.1 - Fri, 12 Jun 2015 21:14:13 GMT
v0.1.0 - Thu, 30 Apr 2015 22:26:00 GMT
--------------------------------------

-
-


17 changes: 13 additions & 4 deletions dist/react-tinymce.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/react-tinymce.min.js
View file
Open in desktop

Large diffs are not rendered by default.

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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-tinymce",
"version": "0.5.1",
"version": "0.5.2",
"description": "React TinyMCE component",
"main": "lib/main.js",
"scripts": {
Expand Down