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

Add prop to determine first-day-of-week #41

Merged
merged 6 commits into from
Oct 22, 2020
Merged

Add prop to determine first-day-of-week #41

merged 6 commits into from
Oct 22, 2020

Conversation

mst101
Copy link
Contributor

@mst101 mst101 commented Oct 16, 2020

No description provided.

@mst101
Copy link
Contributor Author

mst101 commented Oct 17, 2020

OK @MrWook - I made a silly error when copying across the logic for the blank days and have fixed that in a second commit. Should all be fine now.

I'd be grateful if you could have a look through and merge it in to master. Thanks

Copy link
Collaborator

@MrWook MrWook 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 to me. I just found some small issues.
Could you add an example on the example/demo.vue and in the docs docs/.vuepress/components/demo.vue with a settings selector to define the first-day-of-week?

Like always thanks for you contribution! 👍

docs/guide/Props/README.md Outdated Show resolved Hide resolved
docs/guide/Props/README.md Outdated Show resolved Hide resolved
src/components/PickerMonth.vue Outdated Show resolved Hide resolved
src/components/Datepicker.vue Outdated Show resolved Hide resolved
test/unit/specs/PickerDay/firstDayOfWeek.spec.js Outdated Show resolved Hide resolved
@mst101
Copy link
Contributor Author

mst101 commented Oct 20, 2020

Thanks for checking this through.
Just a quick question - how would you like me to make these changes in Git? Shall I create a new commit with the changes you suggest, or would you prefer it if I rebased all my changes into one single commit? Or doesn't it matter?!

@MrWook
Copy link
Collaborator

MrWook commented Oct 20, 2020

You can just create a new commit, i will squash same anyway.

@mst101
Copy link
Contributor Author

mst101 commented Oct 20, 2020

Ok thanks

Copy link
Contributor

@sebsobseb sebsobseb left a comment

Choose a reason for hiding this comment

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

Would be great to also add this 'breaking change' in the Migration section: https://sumcumo.github.io/vue-datepicker/guide/Migration/
That the prop is replaced with this new prop.

@MrWook
Copy link
Collaborator

MrWook commented Oct 21, 2020

Hey @sebsobseb i will create a complete Migration guide to get from 2.x.x to 3.x.x
There will be more than this breaking change like the popup which changed the html a little bit and the open improved build process.

@MrWook MrWook added the enhancement New feature or request label Oct 21, 2020
@mst101
Copy link
Contributor Author

mst101 commented Oct 21, 2020

@MrWook - how would you like me to proceed with pull requests for:

a) fixing a small bug with the typeable calendar not formatting correctly onblur
b) replacing blankDays with dates from the previous/next months
c) keyboard navigation

Shall I wait until you have merged the current changes into master, or create a new branch from the current status of my first-day-of-week changes?

@MrWook
Copy link
Collaborator

MrWook commented Oct 21, 2020

@mst101 the best approach is if you make a branch and a PR for each topic.
This way we can have a clean commit history with squash commits which will make the changelog a lot easier to read.

In this repo the example for the demo page and the example demo page is still missing.

If you like you can already start with the other stuff, too. You don't need to wait for me. You just need to keep in mind that you probably need to resolve Merge conflicts this way.

@mst101
Copy link
Contributor Author

mst101 commented Oct 21, 2020

OK thanks - in that case, I'll create a new commit with first-day-of-week examples in this PR and will create new branches for the other changes (and, as you say, resolve any merge conflicts).

@MrWook MrWook merged commit 78abc56 into sumcumo:master Oct 22, 2020
@mst101 mst101 deleted the feat/first-day-of-week-prop branch October 23, 2020 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants