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

Datepicker and Calendar: WIP #1260

Closed
wants to merge 177 commits into from
Closed

Datepicker and Calendar: WIP #1260

wants to merge 177 commits into from

Conversation

@fnagel
Copy link
Member

fnagel commented Jun 4, 2014

This was replaced by #1281.

This PR introduces the Calendar widget which is utilized in Datepicker widget. It also includes several improvements and changes as outlined in the wiki: http://wiki.jqueryui.com/w/page/12137778/Datepicker

Included changes and bugfixes:

  • Introduce value option
  • Split functionality into Datepicker and Calendar widget
  • Fix item highlighting when month is changed
  • Make use of uniqueId method
  • Improvements for $.date
  • Add min and max option
  • Fix some minor style issues for multi calendar support
  • Fix most demos
  • Fixed and improved existing datepicker unit tests
  • Improved localization, added localization unit tests.
tjvantoll and others added 30 commits Aug 26, 2013
…ribly, but at least it loads with its dependencies.
…ng with phantomjs. Fix various jshint warnings in date_core tests and datepicker src
…sing that through to $.date
…'t mean that they actually work for the most part
…ize to parse and format instead
…se that in other-months demo. Fix handling of extraClasses property, split on space.
… the datepicker from opening with a new cancellable beforeOpen event. Cancel = don't open
This is specifically for multi month pickers. This makes the assumption that the keyboard is always interacting with the first month in a multi month calendar. The next step is to store which grid currently has focus and to base these focus logic off of that.
…ker structure tests.
…none of these options are implemented yet.
These tests are commented out for now as they need a means of getting a Date object from the widget and currently there isn't one.
Disabling these tests as well as they utilize the old getDate() and setDate() methods and there is no replacement for these yet.
Moving widget() method test from core.js as it makes more sense in methods.js.
…st all irrelevant now.
Conflicts:
	Gruntfile.js
	ui/jquery.ui.datepicker.js
Adding tests for the appendTo option.
@fnagel

This comment has been minimized.

Copy link
Member Author

fnagel commented Jun 20, 2014

@tjvantoll I agree - we should merge this soon to keep the PR usable. I already finished removing duplicated demos and started with the unit tests. This will take some more time as it's an non trivial task and I'm starting a new job next week.

@fnagel

This comment has been minimized.

Copy link
Member Author

fnagel commented Jun 27, 2014

@rxaviers Thanks for your comments. Which seems to be no more available, even when using the anchor links within the GitHub notification emails. We already talked about updating Globalize and I will make sure to add proper dependencies to calendar / datepicker.

rxaviers wrote:

General reminder: external/date.js is NOT an external library. It's not hosted (neither version-controlled) anywhere except in here. So, we may need to either make it an external library or move it inside ui/.

@jzaefferer @scottgonzalez @tjvantoll Any thoughts on this?

@jzaefferer

This comment has been minimized.

Copy link
Member

jzaefferer commented Jun 27, 2014

As I wrote in a wiki comment: Regarding the pseudo-external date.js: I suggest handling it as another source file for now, putting it in the "ui" folder. The unit tests already match that. That would be less misleading then what we have now. And we can still extract it later, if we want to.

@rxaviers

This comment has been minimized.

Copy link
Member

rxaviers commented Jun 27, 2014

@fnagel, thanks for bringing it back. After I added a couple of comments in here and talked with Scott about it, I realized my comments made more sense to be added into the wiki instead. So, I've deleted them and edited the wiki accordingly.

@jzaefferer, I think your approach is better than the current scenario. So, 👍

@tjvantoll

This comment has been minimized.

Copy link
Member

tjvantoll commented Jun 29, 2014

+1 to putting date.js in the "ui" folder for now.

@fnagel

This comment has been minimized.

Copy link
Member Author

fnagel commented Jul 2, 2014

PR updated: work on unit tests (fix calendar tests and remove duplicates), fix calendar demos, removed duplicated demos, fix some minor issues.

@scottgonzalez

This comment has been minimized.

Copy link
Member

scottgonzalez commented Jul 2, 2014

Can you rebase this? It's really hard to see what's actually happening with all the old commits.

@fnagel

This comment has been minimized.

Copy link
Member Author

fnagel commented Jul 2, 2014

We already talked about rebase vs. merge and agreed to merge datepicker branch as a rebase is to much trouble.

The latest commits start at TJs comment from June 19.

We talked about closing this PR as soon as I finish the unit tests split (which should be very soon as all test except the options tests are ready).

@jzaefferer

This comment has been minimized.

Copy link
Member

jzaefferer commented Jul 2, 2014

How about merging master into the datepicker branch, the rebasing this PR on top of it? That should get the non-datepicker commits out of this PR.

fnagel added 3 commits Jul 2, 2014
Conflicts:
	demos/calendar/buttonbar.html
	demos/calendar/dropdown-month-year.html
	demos/calendar/multiple-months.html
	demos/datepicker/alt-field.html
	demos/datepicker/animation.html
	demos/datepicker/date-formats.html
	demos/datepicker/date-range.html
	demos/datepicker/default.html
	demos/datepicker/icon-trigger.html
	demos/datepicker/inline.html
	demos/datepicker/localization.html
	demos/datepicker/min-max.html
	demos/datepicker/other-months.html
	demos/datepicker/show-week.html
	external/globalize/globalize.culture.de-DE.js
	external/globalize/globalize.culture.ja-JP.js
	tests/unit/datepicker/datepicker.html
@fnagel

This comment has been minimized.

Copy link
Member Author

fnagel commented Jul 7, 2014

@scottgonzalez Did you manage to find some time to look at this PR?

@scottgonzalez

This comment has been minimized.

Copy link
Member

scottgonzalez commented Jul 7, 2014

I've gotten through all the commits in the original datepicker branch (see https://github.com/scottgonzalez/jquery-ui/tree/datepicker-rebase-cleanup) and I'll likely be able to start on the rebase of this tomorrow morning. I expect to have the rebase done before this week's meeting.

@fnagel

This comment has been minimized.

Copy link
Member Author

fnagel commented Jul 7, 2014

Nice, thanks for the info.

I'm not sure if I will be able to attend the meeting this week as I'll be at a customer site.

@scottgonzalez scottgonzalez mentioned this pull request Jul 14, 2014
@scottgonzalez

This comment has been minimized.

Copy link
Member

scottgonzalez commented Jul 14, 2014

Moved to #1281.

@fnagel fnagel mentioned this pull request Sep 3, 2014
@rxaviers rxaviers mentioned this pull request Sep 4, 2014
7 of 8 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.