Skip to content

config extend #88

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

config extend #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
config extend
  • Loading branch information
changbin.wangcb committed Nov 10, 2017
commit b37573cec0aa86af3d29a39c63f66f0151d07384
5 changes: 4 additions & 1 deletion lib/components/TinyMCE.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import { findDOMNode } from 'react-dom';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import extend from 'lodash/extend';
import isEqual from 'lodash/isEqual';
import clone from 'lodash/clone';
import uuid from '../helpers/uuid';
Expand Down Expand Up @@ -102,11 +103,13 @@ const TinyMCE = createReactClass({
);
},

_init(config, content) {
_init(defaultConfig, content) {
if (this._isInit) {
this._remove();
}

const config = extend({}, defaultConfig);

// hide the textarea that is me so that no one sees it
findDOMNode(this).style.hidden = 'hidden';

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.7.0",
"version": "0.7.1",
"description": "React TinyMCE component",
"main": "lib/main.js",
"scripts": {
Expand Down