Merge pull request #41 from ithielnor/master

Fix popover hiding, remove obsolete BS workaround

Author: ithielnor

Build/CommonAssemblyInfo.cs

@@ -15,5 +15,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.84.1")]
-[assembly: AssemblyFileVersion("1.0.84.1")]
+[assembly: AssemblyVersion("1.0.84.3")]
+[assembly: AssemblyFileVersion("1.0.84.3")]

Griddly/Scripts/griddly.js

@@ -602,7 +602,7 @@
                     // TODO: figure out how to have griddly in modal and still use body container. as it is, something about the modal
                     // blocks inputs in popovers from getting focus. so as a fallback I put it back in the bouding container, 
                     // which will work but means it will get cut off if griddly is scrollable
-                    container: el, // this.$element.parents(".modal").length ? null : "body",
+                    container: null, // this.$element.parents(".modal").length ? null : "body",
                     template: '<div class="popover griddly-filter-popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>',
                     content: function ()
                     {
@@ -1211,17 +1211,17 @@
         $("[data-role=griddly]").griddly();
         $(document).on("click", "[data-role=griddly-button]", GriddlyButton.handleClick);
 
-        // patch stupid bootstrap js so it doesn't .empty() our inline filter dropdowns
-        // remove once bs fixes: https://github.com/twbs/bootstrap/pull/14244
-        var setContent = $.fn.popover.Constructor.prototype.setContent;
+        // patch bootstrap js so it doesn't .empty() our inline filter dropdowns
+        // include if using bootstrap < 3.3.0
+        //var setContent = $.fn.popover.Constructor.prototype.setContent;
 
-        $.fn.popover.Constructor.prototype.setContent = function ()
-        {
-            var $tip = this.tip();
+        //$.fn.popover.Constructor.prototype.setContent = function ()
+        //{
+        //    var $tip = this.tip();
 
-            $tip.find('.popover-content').children().detach();
+        //    $tip.find('.popover-content').children().detach();
 
-            setContent.call(this);
-        };
+        //    setContent.call(this);
+        //};
     });
 }(window.jQuery);