Search components migration #880
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
davidbgk
reviewed
May 9, 2017
| }, | ||
| onFocus(e) { | ||
| if (!this.picking || e.target !== this.pickedField) { | ||
| console.log('should focus'); |
| onChange(e) { | ||
| try { | ||
| this.currentValue = moment(e.target.value, DATE_FORMAT); | ||
| } catch(e) {} |
js/components/form/date-picker.vue
Outdated
| onChange(e) { | ||
| try { | ||
| this.value = moment(e.target.value, this.dateFormat); | ||
| } catch(e) {} |
| onChange(e) { | ||
| try { | ||
| this.currentValue = moment(e.target.value, this.dateFormat); | ||
| } catch(e) {} |
|
|
||
| // Legacy depdencies soon to be dropped |
udata/templates/search.html
Outdated
| {% set total=territories|length %} | ||
| {% if total==1 %} | ||
| <a href="{{ territories.0.url }}"> | ||
| {{ _('Territory:') }} | ||
| <span class="badge">{{ territories.0.name }}</span> | ||
| </a> | ||
| {% else %} | ||
| <a href="#territories" data-toggle="tab"> | ||
| <a href@click.prevent="setTab('territories')"> |
js/components/calendar.vue
Outdated
| .year(this.currentYear) | ||
| .format('MMMM YYYY'); | ||
| monthDisplay() { | ||
| return moment().month(this.currentMonth).year(this.currentYear).format('MMMM YYYY'); |
There was a problem hiding this comment.
Turn this format into a constant?
| border: none; | ||
| border-radius: @border-radius-base; | ||
|
|
||
| &:hover { |
There was a problem hiding this comment.
Fixed: was mix of spaces and tabs (copy-paste :/). Now it's space everywhere
davidbgk
reviewed
May 9, 2017
| @@ -34,6 +34,7 @@ | |||
| <script> | |||
| import Calendar from 'components/calendar.vue'; | |||
| import moment from 'moment'; | |||
| import log from 'logger'; | |||
There was a problem hiding this comment.
I can't see where log is finally in use, 👍 for comments
There was a problem hiding this comment.
Oups, forgot to remove (I started with logging first and this how I remember why the catch blocks where empty)
davidbgk
reviewed
May 9, 2017
| @@ -48,6 +48,7 @@ | |||
| import moment from 'moment'; | |||
|
|
|||
| const VIEWS = ['days', 'months', 'years']; | |||
| const MONTH_FORMAT = 'MMMM YYYY'; | |||
There was a problem hiding this comment.
Maybe we should put all date-related constants somewhere?
There was a problem hiding this comment.
Yes, but in this this case this very specific to the way its used/displayed into the widget
davidbgk
approved these changes
May 15, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is part of #526:
minandmaxvalues to disable some dates