Merge pull request #184 from ramnathv/joe/bugfix/resize-on-shown-bs3

Shown/hidden events not subscribed to properly for Bootstrap 3
ramnathv · Feb 11, 2016 · 10ddd77 · 10ddd77
2 parents 0606dc0 + 3fd7d24
commit 10ddd77
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/inst/www/htmlwidgets.js b/inst/www/htmlwidgets.js
@@ -524,8 +524,8 @@
           // call resize handlers for Shiny outputs, not for static
           // widgets, so we do it ourselves.
           if (window.jQuery) {
-            window.jQuery(document).on("shown", resizeHandler);
-            window.jQuery(document).on("hidden", resizeHandler);
+            window.jQuery(document).on("shown.htmlwidgets shown.bs.tab.htmlwidgets", resizeHandler);
+            window.jQuery(document).on("hidden.htmlwidgets hidden.bs.tab.htmlwidgets", resizeHandler);
           }
 
           // This is needed for the specific case of ioslides, which