这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@darrenhaken
Copy link

...d date.

Added .idea to gitignore to ignore JetBrains IDE config files
Executing grunt default caused jshint errors as some variables are not in use. Removed unused variables and now all tasks run fine
Encapsulated the creation of the 3 different sections of the calendar in picker.date.js
Resolved error in grunt file with addtional ',' added.

This reverts commit f828b53.

Conflicts:
	api.htm
	lib/compressed/picker.date.js
	lib/compressed/picker.js
	lib/compressed/picker.time.js
	lib/picker.date.js
@amsul
Copy link
Owner

amsul commented Jul 9, 2014

@darrenhaken thanks for this! Could you possibly clean up the PR by reverting changes that aren’t directly related to the “close” button? It’ll make my life much easier in seeing the relevant diff.

Darren Haken added 2 commits July 10, 2014 09:54
…ect for the users timezone. For example 'Wed Jul 23 2014 00:00:00 GMT+0100 (BST)' should be interpretted as 23 July, 2014'. Added .idea to gitignore for JetBrains IDEs.
…isted in the code base through unused variables/functions in demo.js
@darrenhaken
Copy link
Author

@amsul I've updated the PR so that the Close Button feature does not contain the style changes in the last commit (sorry about that!).

I have also reverted the UTC changes and added the local time test so that functionality is restored to v 3.5.2.

My suggestion is to look into UTC further and reapply it when the implications are understood.
Hopefully the test I added will spot problems this time. I'm happy to work on the UTC problem with you if you would like any help.

-Darren

@amsul amsul added this to the 3.5.3 milestone Jul 12, 2014
@amsul amsul merged commit 89e46ba into amsul:dev Jul 12, 2014
amsul added a commit that referenced this pull request Jul 12, 2014
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.

2 participants