wice_grid 7.2.1 → 7.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a421d8f3b7e11e7a44368c172f11da2494944d7eda530743bde0b9a99ee36beb
4
- data.tar.gz: 4ad26ab72641ab4cba0cd656b7e882fb5ce6535b20226771b0a60fa0940e3664
3
+ metadata.gz: 93481a5cbaf96ec2601778f453fe6e451fe705eeb02e581ec5186c634285f2c6
4
+ data.tar.gz: 4377db7de0c0545a0707b7d9eb206c736e6b10db2cdaddc9c371b4c22b7c342d
5
5
  SHA512:
6
- metadata.gz: 82341a61779bdcaad9d9be00d5bad5ae4d2a387c62d8fcb273259d72df2c3f9538701b9ca7b6561a48b34259c2b390b2f5bd7216276a0e8854937fce92180446
7
- data.tar.gz: d9f09fad0c4027fce37612768f70ee36872f82e10225561731cfe2a81e829150b9ea9633e16c9c3d4a79c57e5c9e63340ef840979287fbcd68abdd6683238f05
6
+ metadata.gz: 40f38d5e336bbfb22e003962fd3877d4c6aed0fb00455c8c76f03c4572e2134381b2f2f9bfd7edf05dea5d6424e46e05c0192798ad412b4add602fa7bf08e2c4
7
+ data.tar.gz: 7ae03394c1efdc49b4faa58cb337a87ac606d74ad92f6305c4d0f8725d6bd35115b52111317ba18307306fba45d18d54650852de96e24c941633f840adf18e5c
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ ## 7.3.0
2
+
3
+ * The old bug with the calendar that doubles the icons at return to a page and
4
+ stops working is fixed
5
+
1
6
  ## 7.2.1
2
7
 
3
8
  * Bugfix: SQL injection fixed
data/Gemfile.lock CHANGED
@@ -16,7 +16,7 @@ GIT
16
16
  PATH
17
17
  remote: .
18
18
  specs:
19
- wice_grid (7.2.1)
19
+ wice_grid (7.3.0)
20
20
  coffee-rails (>= 5.0.0)
21
21
  jquery-rails
22
22
  kaminari
@@ -120,44 +120,57 @@ setupJqueryUiDatepicker = ->
120
120
  labelText = datepickerHiddenField.data('button-text')
121
121
 
122
122
  # datepicker constructor
123
- datepickerHiddenField.datepicker
124
- firstDay: 1
125
- dateFormat: dateFormat
126
- changeMonth: true
127
- changeYear: true
128
- yearRange: yearRange
129
-
130
- onSelect: (dateText, inst) ->
131
-
132
- selectedDate = $(this).datepicker("getDate")
133
-
134
- moveDateBoundIfInvalidPeriod(
135
- 'the-other-datepicker-id-to',
136
- datepickerHiddenField,
137
- selectedDate,
138
- dateFormat,
139
- (theOther, selected)-> theOther < selected
140
- )
141
-
142
- moveDateBoundIfInvalidPeriod(
143
- 'the-other-datepicker-id-from',
144
- datepickerHiddenField,
145
- selectedDate,
146
- dateFormat,
147
- (theOther, selected)-> theOther > selected
148
- )
149
-
150
- $(that).html(dateText)
151
- if eventToTriggerOnChange
152
- datepickerHiddenField.trigger(eventToTriggerOnChange)
123
+ datepickerInstance = $.data(datepickerHiddenField[0], 'datepicker')
124
+
125
+ if datepickerInstance && datepickerInstance.dpDiv.parent()[0] != document.body
126
+ datepickerHiddenField.datepicker('destroy')
127
+ datepickerInstance = null
128
+
129
+ unless datepickerInstance
130
+ datepickerHiddenField.removeClass('hasDatepicker')
131
+ datepickerHiddenField.datepicker
132
+ firstDay: 1
133
+ dateFormat: dateFormat
134
+ changeMonth: true
135
+ changeYear: true
136
+ yearRange: yearRange
137
+
138
+ onSelect: (dateText, inst) ->
139
+
140
+ selectedDate = $(this).datepicker("getDate")
141
+
142
+ moveDateBoundIfInvalidPeriod(
143
+ 'the-other-datepicker-id-to',
144
+ datepickerHiddenField,
145
+ selectedDate,
146
+ dateFormat,
147
+ (theOther, selected)-> theOther < selected
148
+ )
149
+
150
+ moveDateBoundIfInvalidPeriod(
151
+ 'the-other-datepicker-id-from',
152
+ datepickerHiddenField,
153
+ selectedDate,
154
+ dateFormat,
155
+ (theOther, selected)-> theOther > selected
156
+ )
157
+
158
+ $(that).html(dateText)
159
+ if eventToTriggerOnChange
160
+ datepickerHiddenField.trigger(eventToTriggerOnChange)
153
161
 
154
162
  datepickerContainer = datepickerHiddenField.parent()
155
163
 
156
- $(removeLink).before(" <i class=\"fa fa-calendar ui-datepicker-trigger\" title=\"#{labelText}\" ></i> ")
164
+ calendarIcons = datepickerContainer.children('.ui-datepicker-trigger')
165
+ calendarIcons.slice(1).remove()
157
166
 
158
- newlyAdded = $('.fa-calendar', datepickerContainer)
167
+ unless calendarIcons.length
168
+ calendarIcons = $("<i class=\"fa fa-calendar ui-datepicker-trigger\" title=\"#{labelText}\"></i>")
169
+ $(removeLink).before(calendarIcons)
159
170
 
160
- newlyAdded.click ->
171
+ calendarIcons = datepickerContainer.children('.ui-datepicker-trigger')
172
+ calendarIcons.off('click.wiceGrid').on 'click.wiceGrid', ->
173
+ $.datepicker.dpDiv.appendTo(document.body)
161
174
  datepickerHiddenField.datepicker("show")
162
175
 
163
176
  # hiding and showing the row with filters
data/wice_grid.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'wice_grid'
3
- s.version = '7.2.1'
3
+ s.version = '7.3.0'
4
4
  s.authors = ['Yuri Leikind, Dimitri Kulk, and contributors']
5
5
  s.email = ['dim.kulk@gmail.com']
6
6
  s.homepage = 'https://github.com/leikind/wice_grid'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wice_grid
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.2.1
4
+ version: 7.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yuri Leikind, Dimitri Kulk, and contributors