Skip to content

Fix #66 #67

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 2 commits into from
Apr 4, 2016
Merged

Fix #66 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d83fed4
Fixes #66 by excluding anchor tags within a .griddly table with data…
nickdevore Mar 23, 2016
cf73479
Ignore .vs directory
nickdevore Mar 23, 2016
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,5 @@ _ReSharper*/
~$*

#NuGet
packages/
packages/
.vs
2 changes: 1 addition & 1 deletion Griddly/Scripts/griddly.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,7 @@
{
$("[data-role=griddly]").griddly();

$(document).on("click", "[data-role=griddly-button]", GriddlyButton.handleClick);
$(document).on("click", "[data-role=griddly-button]:not(.griddly table a[data-toggle=ajax],.griddly table a[data-toggle=post])", GriddlyButton.handleClick);

// patch bootstrap js so it doesn't .empty() our inline filter dropdowns
// include if using bootstrap < 3.3.0
Expand Down