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

chore: migrating cropper-modal to ES6 #3682

Merged
merged 9 commits into from
Dec 25, 2019
Merged

chore: migrating cropper-modal to ES6 #3682

merged 9 commits into from
Dec 25, 2019

Conversation

maze-runnar
Copy link
Contributor

@maze-runnar maze-runnar commented Dec 4, 2019

Fix for #3618

Checklist

  • I have read the Contribution & Best practices Guide.
  • My branch is up-to-date with the Upstream development branch.
  • The acceptance, integration, unit tests and linter pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

@auto-label auto-label bot added the chore label Dec 4, 2019
@maze-runnar maze-runnar changed the title chore:migrating cropper-modal to ES6 chore: migrating cropper-modal to ES6 Dec 4, 2019
@maze-runnar
Copy link
Contributor Author

maze-runnar commented Dec 4, 2019

@uds5501 @kushthedude please review .

onVisible() {
let viewport = {};
let factor = 150;
let factor = 750;
Copy link
Member

Choose a reason for hiding this comment

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

Revert

@kushthedude
Copy link
Member

Fix build

@kushthedude
Copy link
Member

Fix build

.

@maze-runnar
Copy link
Contributor Author

@kushthedude please review and merge .

uds5501
uds5501 previously approved these changes Dec 21, 2019
Copy link
Contributor

@uds5501 uds5501 left a comment

Choose a reason for hiding this comment

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

Looks good

kushthedude
kushthedude previously approved these changes Dec 21, 2019
@uds5501
Copy link
Contributor

uds5501 commented Dec 22, 2019

@kushthedude update the branch again please and see if it's good to merge after that

@kushthedude
Copy link
Member

@kushthedude update the branch again please and see if it's good to merge after that

Its on hold because of the Croppie PR. ONCE the Croppie one is merged here will be conflicts hence putted on hold.

@kushthedude
Copy link
Member

@maze-runnar Resolve conflicts

@maze-runnar maze-runnar dismissed stale reviews from kushthedude and uds5501 via befd0a6 December 24, 2019 19:01
uds5501
uds5501 previously approved these changes Dec 24, 2019
this.onVisible();
},
cropImage() {
this.$('img').croppie('result', { type: 'base64', size: 'original', quality: 1, format: 'jpeg' }).then(result => {
Copy link
Member

Choose a reason for hiding this comment

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

You removed the very change you made in the RECENT PR

Co-Authored-By: Kush Trivedi <kushthedude@gmail.com>
@iamareebjamal iamareebjamal merged commit 58d4d68 into fossasia:development Dec 25, 2019
@maze-runnar maze-runnar deleted the patch-15 branch January 12, 2020 11:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants