Merge pull request #67 from nickdevore/master

programcsharp · programcsharp · commit 466ac26a5734 · 2016-04-04T11:01:37.000-06:00
Fix #66
diff --git a/.gitignore b/.gitignore
@@ -47,4 +47,5 @@ _ReSharper*/
 ~$*
 
 #NuGet
-packages/
+packages/
+.vs
diff --git a/Griddly/Scripts/griddly.js b/Griddly/Scripts/griddly.js
@@ -1405,7 +1405,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

Original file line number	Diff line number	Diff line change
`@@ -1405,7 +1405,7 @@`
`1405`	`1405`	`{`
`1406`	`1406`	`$("[data-role=griddly]").griddly();`
`1407`	`1407`
`1408`		`- $(document).on("click", "[data-role=griddly-button]", GriddlyButton.handleClick);`
	`1408`	`+ $(document).on("click", "[data-role=griddly-button]:not(.griddly table a[data-toggle=ajax],.griddly table a[data-toggle=post])", GriddlyButton.handleClick);`
`1409`	`1409`
`1410`	`1410`	`// patch bootstrap js so it doesn't .empty() our inline filter dropdowns`
`1411`	`1411`	`// include if using bootstrap < 3.3.0`