Skip to content

Commit a3e7116

Browse files
committed
Handle isNoneAll=true dropdowns with a [None] item in them for setFilterValue
Add support for global default setting before griddly.js loaded Release v1.2.3
1 parent 1dac430 commit a3e7116

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

Build/CommonAssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
//
1616
// You can specify all the values or you can default the Revision and Build Numbers
1717
// by using the '*' as shown below:
18-
[assembly: AssemblyVersion("1.2.2")]
19-
[assembly: AssemblyFileVersion("1.2.2")]
18+
[assembly: AssemblyVersion("1.2.3")]
19+
[assembly: AssemblyFileVersion("1.2.3")]

Griddly/Scripts/griddly.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,11 @@
844844
}
845845
}
846846

847-
input.val([].concat(value));
847+
if (input.parents(".griddly-filter").data("griddly-filter-isnoneall") && value == null)
848+
input.prop("checked", false);
849+
else
850+
input.val([].concat(value));
851+
848852
$(input[0]).change();
849853
},
850854

@@ -1111,7 +1115,7 @@
11111115
return this;
11121116
};
11131117

1114-
$.fn.griddly.defaults =
1118+
$.fn.griddly.defaults = $.extend({},
11151119
{
11161120
pageNumber: 0,
11171121
pageSize: 20,
@@ -1123,7 +1127,7 @@
11231127
autoRefreshOnFilter: true,
11241128
filterMode: null,
11251129
allowedFilterModes: []
1126-
};
1130+
}, $.fn.griddlyGlobalDefaults);
11271131

11281132
function GriddlyButton()
11291133
{ }

0 commit comments

Comments
 (0)