Fix for: Paste buttons has wrong state in read-only mode #2867
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comandeer
previously requested changes
Feb 27, 2019
plugins/clipboard/plugin.js
Outdated
| @@ -1222,11 +1222,14 @@ | |||
| } | |||
|
|
|||
| function stateFromNamedCommand( command ) { | |||
| if ( inReadOnly && command in { paste: 1, cut: 1 } ) | |||
| // We need to correctly update toolbar states on readOnly (#2775). | |||
| if ( ( inReadOnly || editor.readOnly ) && command in { paste: 1, cut: 1 } ) { | |||
There was a problem hiding this comment.
Won't it be better to ensure that inReadOnly variable contains correct info?
There was a problem hiding this comment.
This variable is used only here, but it is updated in other places, I'll move it here.
tests/plugins/clipboard/readonly.js
Outdated
| @@ -58,4 +58,47 @@ var tests = { | |||
|
|
|||
| tests = bender.tools.createTestsForEditors( CKEDITOR.tools.objectKeys( bender.editors ), tests ); | |||
|
|
|||
| tests = CKEDITOR.tools.object.merge( tests, { | |||
There was a problem hiding this comment.
You can simply:
Suggested change
| tests = CKEDITOR.tools.object.merge( tests, { | |
| tests[ 'test paste command state in divarea editor' ] = function() { |
tests/plugins/clipboard/readonly.js
Outdated
| assertCommands( CKEDITOR.TRISTATE_DISABLED, 'true' ); | ||
|
|
||
| editor.setReadOnly( false ); | ||
| assertCommands( CKEDITOR.TRISTATE_OFF, 'false.' ); |
There was a problem hiding this comment.
Such message is totally unhelpful. Please write more descriptive messages.
|
Overtaking this PR review. |
|
Rebased on latest |
f1ames
approved these changes
Mar 26, 2019
f1ames
dismissed
Comandeer’s stale review
Took over this review. Changes requested earlier where added.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is the purpose of this pull request?
Bugfix
Does your PR contain necessary tests?
All patches which change the editor code must include tests. You can always read more
on PR testing,
how to set the testing environment and
how to create tests
in the official CKEditor documentation.
This PR contains
What changes did you make?
Included
editor.readOnlyin check for command state function.Closes #2775