Integrate button icons with easyimage styles #1555
Merged
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
2bf0215 to
0d11706
Compare
2145411 to
c6b5a76
Compare
|
@f1ames could you rebase onto the latest |
0d11706 to
1ea743e
Compare
|
@Comandeer here you go! |
Comandeer
requested changes
Feb 6, 2018
| assert.ignore(); | ||
| } | ||
|
|
||
| this.addButtonStub = sinon.stub( CKEDITOR.ui.prototype, 'addButton', function( name, definition ) { |
There was a problem hiding this comment.
Button stub causes tests to fail on built version of the editor due to the fact that contextmenu plugin is loaded and addContextMenuItems uses editor.ui.items to get info from toolbar's buttons.
Probably spying instead of stubbing will fix the issue.
There was a problem hiding this comment.
Spy doesn't give an easy solution to do this assert same way as with stub (or I am just bad at searching). I just added call to original function in the stub so it does not affect a normal flow in any way.
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?
Task
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?
This PR integrates #1531 with #1518 adding a proper icon paths passing from easyimage styles config object to button constructor, so that icons are visible in easyimage balloon toolbar.
To work properly it needs both #1531 and #1518 merged (unit test passes as it checks if icons path are properly propagated, however manual test is integrational one and it needs #1531 to work properly).
Now it targets
t/932-3393branch (#1518 PR), but can be also merged tot/932-2961(main easyimage branch ATM) after #1518 is merged.