Skip to content

Commit 24bf8b4

Browse files
committed
small fix for url - adding not support for date range and text input
1 parent d37572e commit 24bf8b4

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

jquery.filters.js

+15-8
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@
764764

765765
function addInputSelectedToDataModal(selectBox){
766766
var data = genericCollect(selectBox, textType);
767-
modifySelectedFilterData(data.serverParameterName, data.value);
767+
modifySelectedFilterData(data.serverParameterName, data.value, textType);
768768
}
769769

770770
function bindSingleClick(){
@@ -783,7 +783,7 @@
783783
$('.remove-filter').on('click', function(){
784784
var serverFilterName = $(this).parent('.selectbox').attr('data-attribute');
785785

786-
modifySelectedFilterData(serverFilterName, undefined);
786+
modifySelectedFilterData(serverFilterName, undefined, null);
787787

788788
//re render the filter
789789
filterModal.that.renderFilter();
@@ -927,7 +927,7 @@
927927
}
928928

929929

930-
function modifySelectedFilterData(key, value){
930+
function modifySelectedFilterData(key, value, type){
931931
var removed = false;
932932
if (value) {
933933
filterModal.selectedFilterParameters[key] = value;
@@ -936,7 +936,11 @@
936936
delete filterModal.selectedFilterParameters[key];
937937
}
938938

939-
embodySelectedFiltersInUrl(removed)
939+
// currently on single and multi are supported,
940+
// TODO - add date range and text input
941+
if ($.inArray(type, [single, multiCheckBoxes]) > -1) {
942+
embodySelectedFiltersInUrl(removed)
943+
}
940944

941945
}
942946

@@ -1091,7 +1095,7 @@
10911095
humanParameterName = getAttributeHumanName(selectBox),
10921096
data = buildElementData(selectedItem, single);
10931097

1094-
modifySelectedFilterData(serverParameterName, {attributeHumaneName: humanParameterName, values: [data]})
1098+
modifySelectedFilterData(serverParameterName, {attributeHumaneName: humanParameterName, values: [data]}, single)
10951099
}
10961100

10971101
function addMultiSelectedToDataModal(selectBox, dontAlert){
@@ -1108,15 +1112,17 @@
11081112
return {checked: []};
11091113
}
11101114

1111-
modifySelectedFilterData(serverParameterName, { attributeHumaneName: humanParameterName, values: optionsResult.checked});
1115+
modifySelectedFilterData(serverParameterName,
1116+
{ attributeHumaneName: humanParameterName, values: optionsResult.checked},
1117+
multiCheckBoxes);
11121118

11131119
return {checked: optionsResult.checked}
11141120
}
11151121

11161122
function addDateSelectedToDataModal(selectBox){
11171123
var data = genericCollect(selectBox, dateRange);
11181124

1119-
modifySelectedFilterData(data.serverParameterName, data.value);
1125+
modifySelectedFilterData(data.serverParameterName, data.value, dateRange);
11201126
}
11211127

11221128
function resetShowSingleFilterIfNeeded(){
@@ -1158,7 +1164,8 @@
11581164
modifySelectedFilterData(serverParameterName, {
11591165
attributeHumaneName: humanParameterName,
11601166
values: selected
1161-
});
1167+
},
1168+
parameter.type);
11621169
}
11631170
}
11641171
});

0 commit comments

Comments
 (0)