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

Fix selecting month or year from month or year views with a valid date #197

Merged
merged 2 commits into from
Feb 21, 2014

Conversation

howbazaar
Copy link
Contributor

Fixes issue #196.

The easiest approach seems to be to leave the change method early if the viewMode isn't the day view.

@howbazaar
Copy link
Contributor Author

Looking at the code in more detail, I have a feeling that this is the wrong approach.

I'll submit another pull request, and you can see if you think that one is better.

@howbazaar
Copy link
Contributor Author

Ah... It seems that github has just used my new approach with this pull request.

The picker.date should only be set when a span is clicked on if the current view mode is the same as the min view mode. Otherwise it exits early.

Eonasdan added a commit that referenced this pull request Feb 21, 2014
Fix selecting month or year from month or year views with a valid date
@Eonasdan Eonasdan merged commit e486e98 into Eonasdan:master Feb 21, 2014
@howbazaar howbazaar deleted the fix-viewmode branch February 22, 2014 22:49
Eonasdan added a commit that referenced this pull request Mar 3, 2014
## 3.0.0
## **Breaking changes in this update! Pay attention!!**
* Fix for #170, #179, #183: Changed event to `dp.-` options load as
`data-date-OPTION` instead of `data-OPTION`. This should fix the double
change event firing.
* Fix for #192: `setDate` now fires `dp.change`
* Fix for #182: Picker will **not** set the default date if the input
field has a value
* Fix for #169: Seconds doesn't get reset when changing the date (Thanks
to PR #174)
* Fix for #168 z-index fix for BS modal
* Fix for #155 Picker properly displays the active year and month
* Fix for #154 CSS update to fix the collapse jump
* Fix for #150 and #75 `minViewMode` and `viewMode` work properly
* Fix for #44 Finally! It's here!! Thanks to @ruiwei and his code on
#210 picker will adjust the positioning of the widget.

#### **Manually merged PR**
* #178 When using `minuteStepping` the minute select grid will only show
available steppings
* #195, #197 Using the `data-OPTION` has been changed to
`data-date-OPTION`. These options are expected to be on the
`input-group` if you're using the `form-group` **or** the input field
* #184 The option `sideBySide` change be used to display both the d and
the timepicker side by side

#### **Other Changes**
* Changed picker width to 300px if using seconds and am/pm
* Added option `useCurrent`, thanks to @ruiwei. When true, picker will
set the value to the current date/time (respects picker's format)
* Added option `showToday`, thanks to @ruiwei. When true, picker will
display a small arrow to indicate today's date.
* Changed `startDate` to `minDate` and `endDate` to `maxDate` to make it
more clear what these options do.
@ghost ghost locked and limited conversation to collaborators Jun 17, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants