diff --git a/CHANGELOG.md b/CHANGELOG.md index ab37b16..da48af9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -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 @@ -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 -------------------------------------- -- +- diff --git a/dist/react-tinymce.js b/dist/react-tinymce.js index 0c3ba3e..ca2e47b 100644 --- a/dist/react-tinymce.js +++ b/dist/react-tinymce.js @@ -126,16 +126,25 @@ return /******/ (function(modules) { // webpackBootstrap }, componentWillReceiveProps: function componentWillReceiveProps(nextProps) { - if (!(0, _lodashLangIsEqual2['default'])(this.props.config, nextProps.config)) { - this._init(nextProps.config, nextProps.content); - } if (!(0, _lodashLangIsEqual2['default'])(this.props.id, nextProps.id)) { this.id = nextProps.id; } + if (!(0, _lodashLangIsEqual2['default'])(this.props.config, nextProps.config) || !(0, _lodashLangIsEqual2['default'])(this.props.id, nextProps.id)) { + this._init((0, _lodashLangClone2['default'])(nextProps.config), nextProps.content); + return; + } + + var editor = tinymce.EditorManager.get(this.id); + if (!(0, _lodashLangIsEqual2['default'])(editor.getContent({ format: 'html' }), nextProps.content)) { + editor.setContent(nextProps.content); + + editor.selection.select(editor.getBody(), true); + editor.selection.collapse(false); + } }, shouldComponentUpdate: function shouldComponentUpdate(nextProps) { - return !(0, _lodashLangIsEqual2['default'])(this.props.content, nextProps.content) || !(0, _lodashLangIsEqual2['default'])(this.props.config, nextProps.config); + return !(0, _lodashLangIsEqual2['default'])(this.props.config, nextProps.config); }, componentWillUnmount: function componentWillUnmount() { diff --git a/dist/react-tinymce.min.js b/dist/react-tinymce.min.js index 43adbc3..6c72ec8 100644 --- a/dist/react-tinymce.min.js +++ b/dist/react-tinymce.min.js @@ -1,2 +1,2 @@ -!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e(require("React"),require("ReactDOM")):"function"==typeof define&&define.amd?define(["React","ReactDOM"],e):"object"==typeof exports?exports.ReactTinymce=e(require("React"),require("ReactDOM")):t.ReactTinymce=e(t.React,t.ReactDOM)}(this,function(t,e){return function(t){function e(n){if(r[n])return r[n].exports;var o=r[n]={exports:{},id:n,loaded:!1};return t[n].call(o.exports,o,o.exports,e),o.loaded=!0,o.exports}var r={};return e.m=t,e.c=r,e.p="",e(0)}([function(t,e,r){"use strict";t.exports=r(1)},function(t,e,r){"use strict";function n(t){return t&&t.__esModule?t:{"default":t}}var o=r(2),c=n(o),i=r(3),u=r(4),a=n(u),f=r(29),s=n(f),p=r(44),l=n(p),d=r(45),b=n(d),y=["focusin","focusout","click","dblclick","mousedown","mouseup","mousemove","mouseover","beforepaste","paste","cut","copy","selectionchange","mouseout","mouseenter","mouseleave","keydown","keypress","keyup","contextmenu","dragend","dragover","draggesture","dragdrop","drop","drag","BeforeRenderUI","SetAttrib","PreInit","PostRender","init","deactivate","activate","NodeChange","BeforeExecCommand","ExecCommand","show","hide","ProgressState","LoadContent","SaveContent","BeforeSetContent","SetContent","BeforeGetContent","GetContent","VisualAid","remove","submit","reset","BeforeAddUndo","AddUndo","change","undo","redo","ClearUndos","ObjectSelected","ObjectResizeStart","ObjectResized","PreProcess","PostProcess","focus","blur","dirty"],v=y.map(function(t){return"on"+b["default"](t)}),j=c["default"].createClass({displayName:"TinyMCE",propTypes:{config:c["default"].PropTypes.object,content:c["default"].PropTypes.string,id:c["default"].PropTypes.string,className:c["default"].PropTypes.string},getDefaultProps:function(){return{config:{},content:""}},componentWillMount:function(){this.id=this.id||this.props.id||l["default"]()},componentDidMount:function(){var t=s["default"](this.props.config);this._init(t)},componentWillReceiveProps:function(t){a["default"](this.props.config,t.config)||this._init(t.config,t.content),a["default"](this.props.id,t.id)||(this.id=t.id)},shouldComponentUpdate:function(t){return!a["default"](this.props.content,t.content)||!a["default"](this.props.config,t.config)},componentWillUnmount:function(){this._remove()},render:function(){return this.props.config.inline?c["default"].createElement("div",{id:this.id,className:this.props.className,dangerouslySetInnerHTML:{__html:this.props.content}}):c["default"].createElement("textarea",{id:this.id,className:this.props.className,defaultValue:this.props.content})},_init:function(t,e){var r=this;this._isInit&&this._remove(),i.findDOMNode(this).style.hidden="hidden";var n=t.setup,o="function"==typeof n;t.selector="#"+this.id,t.setup=function(t){y.forEach(function(e,n){var o=r.props[v[n]];"function"==typeof o&&t.on(e,function(e){o(e,t)})}),e&&t.on("init",function(){t.setContent(e)}),o&&n(t)},tinymce.init(t),i.findDOMNode(this).style.hidden="",this._isInit=!0},_remove:function(){tinymce.EditorManager.execCommand("mceRemoveEditor",!0,this.id),this._isInit=!1}});v.forEach(function(t){j.propTypes[t]=c["default"].PropTypes.func}),t.exports=j},function(e,r){e.exports=t},function(t,r){t.exports=e},function(t,e,r){function n(t,e,r,n){r="function"==typeof r?c(r,n,3):void 0;var i=r?r(t,e):void 0;return void 0===i?o(t,e,r):!!i}var o=r(5),c=r(27);t.exports=n},function(t,e,r){function n(t,e,r,u,a,f){return t===e?!0:null==t||null==e||!c(t)&&!i(e)?t!==t&&e!==e:o(t,e,n,r,u,a,f)}var o=r(6),c=r(15),i=r(16);t.exports=n},function(t,e,r){function n(t,e,r,n,l,y,v){var j=u(t),h=u(e),g=s,x=s;j||(g=b.call(t),g==f?g=p:g!=p&&(j=a(t))),h||(x=b.call(e),x==f?x=p:x!=p&&(h=a(e)));var m=g==p,A=x==p,O=g==x;if(O&&!j&&!m)return c(t,e,g);if(!l){var w=m&&d.call(t,"__wrapped__"),P=A&&d.call(e,"__wrapped__");if(w||P)return r(w?t.value():t,P?e.value():e,n,l,y,v)}if(!O)return!1;y||(y=[]),v||(v=[]);for(var _=y.length;_--;)if(y[_]==t)return v[_]==e;y.push(t),v.push(e);var R=(j?o:i)(t,e,r,n,l,y,v);return y.pop(),v.pop(),R}var o=r(7),c=r(9),i=r(10),u=r(23),a=r(26),f="[object Arguments]",s="[object Array]",p="[object Object]",l=Object.prototype,d=l.hasOwnProperty,b=l.toString;t.exports=n},function(t,e,r){function n(t,e,r,n,c,i,u){var a=-1,f=t.length,s=e.length;if(f!=s&&!(c&&s>f))return!1;for(;++a-1&&t%1==0&&n>=t}var n=9007199254740991;t.exports=r},function(t,e,r){function n(t){for(var e=a(t),r=e.length,n=r&&t.length,f=!!n&&u(n)&&(c(t)||o(t)),p=-1,l=[];++p-1&&t%1==0&&e>t}var n=/^\d+$/,o=9007199254740991;t.exports=r},function(t,e,r){function n(t){if(null==t)return[];a(t)||(t=Object(t));var e=t.length;e=e&&u(e)&&(c(t)||o(t))&&e||0;for(var r=t.constructor,n=-1,f="function"==typeof r&&r.prototype===t,p=Array(e),l=e>0;++nf))return!1;for(;++a-1&&t%1==0&&r>=t}var r=9007199254740991;t.exports=n},function(t,e,n){function r(t){for(var e=a(t),n=e.length,r=n&&t.length,f=!!r&&u(r)&&(c(t)||o(t)),p=-1,l=[];++p-1&&t%1==0&&e>t}var r=/^\d+$/,o=9007199254740991;t.exports=n},function(t,e,n){function r(t){if(null==t)return[];a(t)||(t=Object(t));var e=t.length;e=e&&u(e)&&(c(t)||o(t))&&e||0;for(var n=t.constructor,r=-1,f="function"==typeof n&&n.prototype===t,p=Array(e),l=e>0;++r