Skip to content

Commit 3693130

Browse files
committed
Do some micro optimizations, coding style
1 parent 157cc95 commit 3693130

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

lib/ajax-datatables-rails/datatable/column/date_filter.rb

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ module Datatable
55
class Column
66
module DateFilter
77

8+
RANGE_DELIMITER = '-'
9+
810
class DateRange
911
attr_reader :begin, :end
1012

@@ -20,11 +22,7 @@ def exclude_end?
2022

2123
# Add delimiter option to handle range search
2224
def delimiter
23-
@view_column[:delimiter] || '-'
24-
end
25-
26-
def empty_range_search?
27-
(formatted_value == delimiter) || (range_start.blank? && range_end.blank?)
25+
@delimiter ||= @view_column.fetch(:delimiter, RANGE_DELIMITER)
2826
end
2927

3028
# A range value is in form '<range_start><delimiter><range_end>'
@@ -39,6 +37,10 @@ def range_end
3937
@range_end ||= formatted_value.split(delimiter)[1]
4038
end
4139

40+
def empty_range_search?
41+
(formatted_value == delimiter) || (range_start.blank? && range_end.blank?)
42+
end
43+
4244
# Do a range search
4345
def date_range_search
4446
return nil if empty_range_search?
@@ -56,11 +58,7 @@ def range_end_casted
5658
end
5759

5860
def parse_date(date)
59-
if Time.zone
60-
Time.zone.parse(date)
61-
else
62-
Time.parse(date)
63-
end
61+
Time.zone ? Time.zone.parse(date) : Time.parse(date)
6462
end
6563

6664
end

0 commit comments

Comments
 (0)