Skip to content

Commit 0741096

Browse files
author
Gena Maly
committed
Fix month number. Remove inject_method
1 parent 49d8109 commit 0741096

File tree

3 files changed

+14
-62
lines changed

3 files changed

+14
-62
lines changed

README.md

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -167,23 +167,3 @@ $.fn.date_range_ext_preset.defaults.hours_offset = +3
167167
// or
168168
$.fn.date_range_ext_preset.defaults.hours_offset = -3
169169
```
170-
171-
### inject_method
172-
173-
value: 'wrap' or 'append'
174-
175-
This is how button "Set rage" will be added to DOM-tree. Play with it to choose best place.
176-
177-
178-
179-
180-
181-
182-
183-
184-
185-
186-
187-
188-
189-

vendor/assets/javascripts/active_admin_date_range_preset.coffee

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
(($) ->
22
# options:
3-
# inject_method: 'append' | 'append' how to insert new HTML into document
43
# gteq_input: jQuery-selecotr for input date_from
54
# lteq_input: jQuery-selecotr for input date_to
65
# hours_offset: Int number - hours +/- to correct time
@@ -17,8 +16,9 @@
1716
return s
1817

1918
# formated date YYYY-MM-DD, with converting to UTC
19+
# note: getMonth Returns the month (from 0-11), so we do +1
2020
formatDate = (date)->
21-
str = date.getFullYear() + '-' + num_with_leading_zero(date.getMonth()) + '-' + num_with_leading_zero(date.getDate())
21+
str = date.getFullYear() + '-' + num_with_leading_zero(date.getMonth()+1) + '-' + num_with_leading_zero(date.getDate())
2222
if opts.show_time
2323
str += ( ' ' + num_with_leading_zero(date.getHours()) + ':' + num_with_leading_zero(date.getMinutes()) + ':' + num_with_leading_zero(date.getSeconds()) )
2424
return str
@@ -60,10 +60,7 @@
6060

6161
# filter modifying
6262
main_btn_html = '<a href="#" class="btn_timerange">Set range</a>'
63-
if opts.inject_method == 'append'
64-
$this.append(main_btn_html)
65-
else
66-
$this.find('label').addClass('datetime_preset_filter_label').append(main_btn_html)
63+
$this.find('label').addClass('datetime_preset_filter_label').append(main_btn_html)
6764

6865
# helper
6966
fillInputs = (start, end)->
@@ -145,7 +142,6 @@
145142
)
146143

147144
$.fn.date_range_ext_preset.defaults = {
148-
inject_method: 'wrap',
149145
# Manual global time shift, from UTC can be +/- number
150146
hours_offset: 0,
151147
# date_to_human_readable = true, then "date_to" consider as including full day without last second
@@ -170,4 +166,5 @@ $(document).on 'ready', ->
170166
# Init in sidebar filters
171167
$('.filter_form .filter_date_range').date_range_ext_preset()
172168
# Init in forms
173-
$('.datetime_preset_pair').date_range_ext_preset({inject_method: 'append'})
169+
$('.datetime_preset_pair').date_range_ext_preset()
170+
Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,12 @@
1-
form.filter_form {
2-
3-
.filter_form_field.filter_date_time_range,
4-
.filter_form_field.filter_date_range {
5-
6-
.datetime_preset_filter_label {
7-
8-
.btn_timerange {
9-
float: right;
10-
margin: -2px 8px 0 0;
11-
text-decoration: none;
12-
border-bottom: 1px dashed;
13-
line-height: 1.4em;
14-
&:hover {
15-
border-bottom: 0 none;
16-
}
17-
}
18-
19-
} // div.label_div
20-
1+
form label.datetime_preset_filter_label .btn_timerange {
2+
float: right;
3+
margin: -2px 8px 0 0;
4+
text-decoration: none;
5+
border-bottom: 1px dashed;
6+
line-height: 1.4em;
7+
&:hover {
8+
border-bottom: 0 none;
219
}
22-
23-
}
24-
25-
26-
.date_time_picker {
27-
28-
.btn_timerange {
29-
text-decoration: none;
30-
border-bottom: 1px dashed;
31-
&:hover {
32-
border-bottom: 0 none;
33-
}
34-
}
35-
3610
}
3711

3812
.block_timerange {
@@ -59,3 +33,4 @@ form.filter_form {
5933
}
6034
}
6135
}
36+

0 commit comments

Comments
 (0)