Fixes for conflicts with Sitevision

malmostad · Mar 7, 2014 · 33b5d16 · 33b5d16
1 parent b4dbc94
commit 33b5d16
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/assets/javascripts/masthead_standalone.js b/app/assets/javascripts/masthead_standalone.js
@@ -1,2 +1,9 @@
 //= require jquery
 //= require masthead_standalone_without_jquery
+
+jQuery(document).ready(function($) {
+  // Steal back the BS dropdown events that SV hijacked
+  if ($svjq) {
+    window.setTimeout(function() { $("[data-toggle=dropdown]").dropdown(); }, 500);
+  }
+});
diff --git a/app/assets/javascripts/masthead_standalone_without_jquery.js b/app/assets/javascripts/masthead_standalone_without_jquery.js
@@ -12,5 +12,7 @@
 
 jQuery(document).ready(function($) {
   // Steal back the BS dropdown events that SV hijacked
-  window.setTimeout(function() { $("[data-toggle=dropdown]").dropdown(); }, 500);
+  if ($svjq) {
+    window.setTimeout(function() { $("[data-toggle=dropdown]").dropdown(); }, 500);
+  }
 });