Skip to content

Commit bf8c1f9

Browse files
committed
Monkeypatched issue with griddly and filter inside modal
1 parent 5bcb958 commit bf8c1f9

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Build/CommonAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
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.0.32.0")]
19-
[assembly: AssemblyFileVersion("1.0.32.0")]
18+
[assembly: AssemblyVersion("1.0.33.0")]
19+
[assembly: AssemblyFileVersion("1.0.33.0")]

Griddly/Scripts/griddly.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,8 +611,11 @@
611611
$(el).popover({
612612
html: true,
613613
placement: "bottom",
614-
container: "body",
615-
template: '<div class="popover griddly-filter-popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>',
614+
// TODO: figure out how to have griddly in modal and still use body container. as it is, something about the modal
615+
// blocks inputs in popovers from getting focus. so as a fallback I put it back in the bouding container,
616+
// which will work but means it will get cut off if griddly is scrollable
617+
container: this.$element.parents(".modal").length ? null : "body",
618+
template: '<div class="popover griddly-filter-popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>',
616619
content: function ()
617620
{
618621
return content;

0 commit comments

Comments
 (0)