Version 3.7.8 release

Author: ithielnor

Build/CommonAssemblyInfo.cs

@@ -12,9 +12,7 @@
 //      Minor Version
 //      Build Number
 //      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
 [assembly: AssemblyVersion("3.7.8")]
 [assembly: AssemblyFileVersion("3.7.8")]
-[assembly: AssemblyInformationalVersion("3.7.8-beta")]
+// Uncomment the informational version to create a pre-release package
+//[assembly: AssemblyInformationalVersion("3.7.8-beta")]

Griddly.NetCore.Razor/wwwroot/js/griddly.js

@@ -566,14 +566,14 @@
         this.setFilterValues(values, true, null, true);
     };
 
-    var hidePopover = function (selector, isBootstrap4or5) {
+    var hidePopover = function (selector, bootstrapVersion) {
         selector.each(function () {
             var filter = $(this);
             if (filter.attr("aria-describedby")) { //This attribute will be present only when the popover is currently shown
                 filter.popover("hide");
 
                 //Workaround for bug introduced in Bootstrap 3.3.5, where hide() doesn't clear out the click state, so toggle() after hide() does not show.
-                if (!isBootstrap4or5 && filter.data("bs.popover").inState) {
+                if (bootstrapVersion < 4 && filter.data("bs.popover").inState) {
                     filter.data("bs.popover").inState.click = false;
                 }
             }
@@ -585,8 +585,10 @@
         this.$element = $(element);
         this.$filterModal = $(".griddly-filter-modal", this.$element);
         this.options = options;
-        this.bootstrapVersion = $.fn.tooltip.Constructor.VERSION.substr(0, 1);
-        this.isBootstrap4or5 = this.bootstrapVersion == "4" || this.bootstrapVersion == "5";
+        this.bootstrapVersion = parseInt($.fn.tooltip.Constructor.VERSION.substr(0, 1));
+        if (isNaN(this.bootstrapVersion))
+            this.bootstrapVersion = 3;
+
         this.create();
         this.isConstructed = false;
         this.eventQueue = [];
@@ -681,7 +683,7 @@
                             tip = filter.data('bs.popover').tip; /*BS4*/
 
                         if ($(tip).hasClass('in') || $(tip).hasClass('show')/*BS4*/) {
-                            hidePopover(filter, self.isBootstrap4or5);
+                            hidePopover(filter, self.bootstrapVersion);
 
                             if (!self.options.autoRefreshOnFilter && self.pendingInlineFilterRefresh) {
                                 self.refresh(true);
@@ -1155,7 +1157,7 @@
                 if (filter.hasClass("griddly-filter-box"))
                 {
                     if (!dontHide && this.options.autoRefreshOnFilter)
-                        hidePopover(filter.find(".filter-trigger"), self.isBootstrap4or5);
+                        hidePopover(filter.find(".filter-trigger"), self.bootstrapVersion);
 
                     var val = trimToNull(getCleanedValue(content.find("input").first().val(), dataType));
 
@@ -1201,7 +1203,7 @@
                 else if (filter.hasClass("griddly-filter-list"))
                 {
                     if (!filter.data("griddly-filter-ismultiple") && !dontHide && this.options.autoRefreshOnFilter)
-                        hidePopover(filter.find(".filter-trigger"), self.isBootstrap4or5);
+                        hidePopover(filter.find(".filter-trigger"), self.bootstrapVersion);
 
                     var allItems = content.find("li:not(.griddly-list-group-header), .dropdown-item");
                     var selectedItems = allItems.filter(":has(:checked)");
@@ -1218,7 +1220,7 @@
                         display = selectedItems.length + " " + filter.data("filter-name-plural");
                     else if (selectedItems.length > 0 && selectedItems.length <= displayItemCount)
                     {
-                        var itemTexts = self.isBootstrap4or5 ? selectedItems : selectedItems.find("a");
+                        var itemTexts = self.bootstrapVersion == 4 || self.bootstrapVersion == 5 ? selectedItems : selectedItems.find("a");
                         var display = $.trim($(itemTexts[0]).text());
 
                         for (var i = 1; i < selectedItems.length && i < displayItemCount; i++)
@@ -1272,7 +1274,7 @@
                     }
 
                     var filter = $input.data("griddly-filter");
-                    hidePopover(filter.find(".filter-trigger"), this.isBootstrap4or5);
+                    hidePopover(filter.find(".filter-trigger"), this.bootstrapVersion);
                 }
             }, this));
 
@@ -1293,15 +1295,15 @@
                     placement: "bottom",
                     container: $(".griddly-filters-inline", this.$element),
                     template:
-                        self.isBootstrap4or5 ? '<div class="popover griddly-filter-popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'
+                        self.bootstrapVersion == 4 || self.bootstrapVersion == 5 ? '<div class="popover griddly-filter-popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'
                         : '<div class="popover griddly-filter-popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>',
                     content: function ()
                     {
                         return content;
                     }
                 }).on("show.bs.popover", function ()
                 {
-                    hidePopover(self.$element.find(".griddly-filters-inline .filter-trigger").not(this), self.isBootstrap4or5);
+                    hidePopover(self.$element.find(".griddly-filters-inline .filter-trigger").not(this), self.bootstrapVersion);
 
                     content.find("input:first").select();
 
@@ -1332,7 +1334,7 @@
                         if (this.pendingInlineFilterRefresh) {
                             this.refresh(true);
                         }
-                        hidePopover(filterTrigger, this.isBootstrap4or5);
+                        hidePopover(filterTrigger, this.bootstrapVersion);
                     }, this));
                 }
 
@@ -1367,7 +1369,7 @@
                     }
                     else
                     {
-                        var item = self.isBootstrap4or5 ? $(this) : $(this).parents("li");
+                        var item = self.bootstrapVersion == 4 || self.bootstrapVersion == 5 ? $(this) : $(this).parents("li");
 
                         var checkbox = $(this).find("input");