Merge pull request #769 from projectblacklight/skip_turbolinks_precheck

No need to check for Turbolinks defined.
projectblacklight · Feb 11, 2014 · c6abd42 · c6abd42
2 parents ac434f2 + f700ae6
commit c6abd42
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/app/assets/javascripts/blacklight/core.js b/app/assets/javascripts/blacklight/core.js
@@ -13,11 +13,12 @@ Blacklight = function() {
   }
 }();
 
-if (typeof Turbolinks !== "undefined") {
-  $(document).on('page:load', function() {
-    Blacklight.activate();  
-  });
-}
+// turbolinks triggers page:load events on page transition
+// If app isn't using turbolinks, this event will never be triggered, no prob. 
+$(document).on('page:load', function() {
+  Blacklight.activate();  
+});
+
 $(document).ready(function() {
   Blacklight.activate();  
 });