Skip to content

Fix popover hiding, remove obsolete BS workaround #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 4, 2015
Merged

Fix popover hiding, remove obsolete BS workaround #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44b4d0a
Fix popover hiding bug on click inside
ithielnor Feb 27, 2015
e049c66
Version 1.0.84.2
ithielnor Feb 27, 2015
5e493e8
Merge branch 'master' of https://github.com/programcsharp/griddly
ithielnor Feb 27, 2015
5c3b810
Release 1.0.84.3
ithielnor Mar 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Build/CommonAssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
20 changes: 10 additions & 10 deletions Griddly/Scripts/griddly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
{
Expand Down Expand Up @@ -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);