Skip to content
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.

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

Updated caching width and height for image2 on src change #1587

Merged
merged 9 commits into from
Jul 26, 2018
Merged

Conversation

jacekbogdanski
Copy link
Member

@jacekbogdanski jacekbogdanski commented Feb 5, 2018

What is the purpose of this pull request?

Bug fix.

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

  • Unit tests
  • Manual tests

What changes did you make?

Updated caching width and height for image2 on src change. Without this change aspect ratio calculation was based on old image width/height.

Closes #1348.

Copy link
Contributor

@f1ames f1ames left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works good 👍

Only some polishing in manual test needed. I also rebased it on latest major.

@@ -74,6 +74,37 @@
wait();
},

// #1348
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remember about proper issues referencing (see https://docs.ckeditor.com/ckeditor4/latest/guide/dev_tests.html#tagging-tests). Here should be:

// (#1348)

@@ -0,0 +1,17 @@
@bender-tags: 4.9.0, bug, 1348
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update tag to 4.9.1.

@@ -0,0 +1,17 @@
@bender-tags: 4.9.0, bug, 1348
@bender-ui: collapsed
@bender-ckeditor-plugins: wysiwygarea, sourcearea, toolbar, image2, link, undo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remember to include only these plugins which are necessary to run the test, here you can go just with wysiwygarea, toolbar, image2.

@bender-ui: collapsed
@bender-ckeditor-plugins: wysiwygarea, sourcearea, toolbar, image2, link, undo

1. Double click on the image to popup dialog.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe Double click on the image to open dialog.?

@bender-ckeditor-plugins: wysiwygarea, sourcearea, toolbar, image2, link, undo

1. Double click on the image to popup dialog.
2. Change url of the image to `/tests//_assets/lena.jpg`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double // in the URL.


1. Double click on the image to popup dialog.
2. Change url of the image to `/tests//_assets/lena.jpg`.
3. Ensure that the image is locked.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ensure that image aspect ratio is locked. ?


## Expected

The image has preserved aspect ratio.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would go with The inserted image has... (so it is clear that image should be inserted). Same in Unexpected.

Copy link
Contributor

@f1ames f1ames left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes to the test are fine, looks good!

However, because of the merge commit (a0431c3) every commit before it, is doubled (e.g. f9474c0 and 8f7c151) - so instead of 4 commits there are 8, which doesn't look good;) Could you rebase cleaning up the commit hisotry (just run git rebase -i HEAD~12 and then you will have a possiblity to drop unnecessary commits).

@jacekbogdanski
Copy link
Member Author

jacekbogdanski commented Feb 17, 2018

This looks bad. I will wait until we meet F2F to talk about this rebase.

Copy link
Contributor

@f1ames f1ames left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I cleaned up the branch. Now looks good 👍

@f1ames
Copy link
Contributor

f1ames commented Feb 19, 2018

It should be merged to master after 4.9.0 release.

@mlewand
Copy link
Contributor

mlewand commented Jul 26, 2018

For some reason we missed this ticket during last releases, I'll update the tags in tests and merge it to 4.10.1.

@mlewand mlewand changed the base branch from major to master July 26, 2018 12:24
@mlewand mlewand merged commit 0013f5c into master Jul 26, 2018
@mlewand mlewand deleted the t/1348 branch July 26, 2018 12:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants