yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 02:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/groups-issue-interupting

Browse Source
This commit is contained in:
Alexandre BODIN 2019-10-18 13:27:07 +02:00 committed by GitHub
commit 415bdcd806
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/3.0.0-beta.x/concepts/parameters.md
View File

@ -1,4 +1,4 @@
# Prameters # Parameters
## Concept ## Concept

10
packages/strapi-plugin-content-manager/admin/src/components/Wysiwyg/index.js
View File

@ -648,11 +648,10 @@ class Wysiwyg extends React.Component {
*/ */
sendData = editorState => { sendData = editorState => {
if ( if (
this.getEditorState().getCurrentContent() === this.getEditorState().getCurrentContent() !==
editorState.getCurrentContent() editorState.getCurrentContent() ||
) editorState.getLastChangeType() === 'remove-range'
return; ) {
this.props.onChange({ this.props.onChange({
target: { target: {
value: editorState.getCurrentContent().getPlainText(), value: editorState.getCurrentContent().getPlainText(),
@ -660,6 +659,7 @@ class Wysiwyg extends React.Component {
type: 'textarea', type: 'textarea',
}, },
}); });
} else return;
}; };
toggleFullScreen = e => { toggleFullScreen = e => {

2
packages/strapi-plugin-users-permissions/controllers/User.js
View File

@ -210,7 +210,7 @@ module.exports = {
null, null,
formatError({ formatError({
id: 'Auth.form.error.email.taken', id: 'Auth.form.error.email.taken',
message: 'Eamil already taken', message: 'Email already taken',
field: ['email'], field: ['email'],
}) })
); );