Check that pickadate and pickatime exist before merging #1041
Conversation
|
Related: #744 |
|
In case it's not obvious why this solution works, the expression:
might look like it should return a boolean but it does not in javascript. If the left side is falsy, it returns the left side without evaluating the right. If the left side is truthy, it returns the right side. So what really happens here is, if |
|
It's a floor wax AND a dessert topping! |
|
@DanielRuf Do you see why it works? |
package.json
Outdated
| { | ||
| "name": "pickadate", | ||
| "version": "3.5.6", | ||
| "version": "3.5.7", |
There was a problem hiding this comment.
Please do not change the version of pickadate.
DanielRuf
left a comment
There was a problem hiding this comment.
Please revert the version change.
e00251d to
38292f5
Compare
…ranslation files.
38292f5 to
30c5541
Compare
|
Reverted. Also rebased with the latest master. |
|
As mentioned in the other PR, fixing the order of the imports is the correct fix. Otherwise your translations wouldn't work properly. |
Loading a translation file could cause js errors in the case that you have not loaded both picker.date.js and picker.time.js. It should not be necessary to load a time picker if you only need a date picker and vice versa. By checking first, it is now safe to load a translation even if you are using only one or the other.