blacklight 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b55b7f3a93d7f6348223872347ac527c11353e36
-  data.tar.gz: 19d7ff3d9f85c84d3b9750482f87b3da8d37f1ca
+  metadata.gz: 39a6ce9d4e75308e52d555bfc2a9142e4a3e323c
+  data.tar.gz: 98fed869e782531d52fd52ba807411ad8c200f59
 SHA512:
-  metadata.gz: fe1cc0c70395f26b382169ae6f05f2ba4781a4a98bec30d50d87b037bb4acc438ec3fe8947e968ddf754994c4284612620a74ef99b37943459564129df97b0ca
-  data.tar.gz: db8975613196501d2492864d078aaf47b4f8fd7438d631bf3c42ca1c51bbfcc84f9b37054318d21c553dc1c14edc712e4425c57dfdf4b493e6766f167fafc562
+  metadata.gz: 8008cc989c982ebb220ae69d01e39070c7b07078ed18bccceb3b64af6c8963eafd7a7e5023cb8925c6cf9da4d8bd1f438fe5f12813835c2c2a56760bcdb16851
+  data.tar.gz: 05e632077c43895265057e9da360862554d69386f42f90d17faee1130877f63e939ee7db9e4fe4cf461dd2d9a5883b9e4b42c2727f5ad8ccaa8e528ec4b991b2

data/.travis.yml

@@ -5,7 +5,7 @@ rvm:
   - 2.1.0
   - 2.0.0
   - 1.9.3
-  - jruby-19mode
+  - jruby
 
 before_install:
   - gem install bundler 

data/VERSION

@@ -1 +1 @@
-5.0.1
+5.0.2

data/app/assets/javascripts/blacklight/ajax_modal.js

@@ -83,12 +83,20 @@ if (Blacklight.ajaxModal === undefined) {
 // a Bootstrap modal div that should be already on the page hidden
 Blacklight.ajaxModal.modalSelector = "#ajax-modal";
 
+// Trigger selectors identify forms or hyperlinks that should open
+// inside a modal dialog.
 Blacklight.ajaxModal.triggerLinkSelector  = "a[data-ajax-modal~=trigger], a.lightboxLink,a.more_facets_link,.ajax_modal_launch";
 Blacklight.ajaxModal.triggerFormSelector  = "form[data-ajax-modal~=trigger], form.ajax_form";
 
-// preserve selectors will be scopied inside the modal only
-Blacklight.ajaxModal.preserveLinkSelector = 'a[data-ajax-modal~=preserve]';
-Blacklight.ajaxModal.preserveFormSelector = 'form[data-ajax-modal~=preserve], form.ajax_form';
+// preserve selectors identify forms or hyperlinks that, if activated already
+// inside a modal dialog, should have destinations remain inside the modal -- but
+// won't trigger a modal if not already in one.
+//
+// No need to repeat selectors from trigger selectors, those will already
+// be preserved. MUST be manually prefixed with the modal selector,
+// so they only apply to things inside a modal.
+Blacklight.ajaxModal.preserveLinkSelector = Blacklight.ajaxModal.modalSelector + ' a[data-ajax-modal~=preserve]';
+Blacklight.ajaxModal.preserveFormSelector = Blacklight.ajaxModal.modalSelector + 'form[data-ajax-modal~=preserve]'
 
 Blacklight.ajaxModal.containerSelector    = "[data-ajax-modal~=container]";
 
@@ -152,12 +160,13 @@ Blacklight.ajaxModal.setup_modal = function() {
 	$("body").trigger(e);
 	if (e.isDefaultPrevented()) return;
 
-  $("body").on("click", Blacklight.ajaxModal.triggerLinkSelector, Blacklight.ajaxModal.modalAjaxLinkClick);
-  $("body").on("submit", Blacklight.ajaxModal.triggerFormSelector, Blacklight.ajaxModal.modalAjaxFormSubmit);
-
-  // preserve selectors apply just within the existing modal
-  $("body").on("click", Blacklight.ajaxModal.modalSelector + " " + Blacklight.ajaxModal.preserveLinkSelector, Blacklight.ajaxModal.modalAjaxLinkClick);
-  $("body").on("submit", Blacklight.ajaxModal.modalSelector + " " + Blacklight.ajaxModal.preserveFormSelector, Blacklight.ajaxModal.modalAjaxFormSubmit);
+  // Register both trigger and preserve selectors in ONE event handler, combining
+  // into one selector with a comma, so if something matches BOTH selectors, it
+  // still only gets the event handler called once. 
+  $("body").on("click", Blacklight.ajaxModal.triggerLinkSelector  + ", " + Blacklight.ajaxModal.preserveLinkSelector,
+    Blacklight.ajaxModal.modalAjaxLinkClick);
+  $("body").on("submit", Blacklight.ajaxModal.triggerFormSelector + ", " + Blacklight.ajaxModal.preserveFormSelector,
+    Blacklight.ajaxModal.modalAjaxFormSubmit);
 
   // Catch our own custom loaded event to implement data-ajax-modal=closed
   $("body").on("loaded.blacklight.ajax-modal", Blacklight.ajaxModal.check_close_ajax_modal);

data/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();  
 });

data/app/views/shared/_header_navbar.html.erb

@@ -1,4 +1,4 @@
-<div id="header-navbar" class="navbar navbar-default navbar-static-top navbar-inverse" role="navigation">
+<div id="header-navbar" class="navbar navbar-inverse navbar-static-top" role="navigation">
   <div class="container">
     <div class="navbar-header">
     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#user-util-collapse">

data/lib/blacklight/utils.rb

@@ -1,7 +1,7 @@
 require 'ostruct'
 module Blacklight
   class OpenStructWithHashAccess < OpenStruct
-    delegate :keys, :each, :map, :has_key?, :delete, :length, :reject!, :select!, :include, :fetch, :to => :to_h
+    delegate :keys, :each, :map, :has_key?, :empty?, :delete, :length, :reject!, :select!, :include, :fetch, :to => :to_h
 
     def []=(key, value)
       send "#{key}=", value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails