blacklight 3.8.2 → 4.0.0.pre6

data/Gemfile

@@ -6,3 +6,4 @@ gemspec
 gem 'rcov', :platform => :mri_18
 gem 'simplecov', :platform => :mri_19
 gem 'simplecov-rcov', :platform => :mri_19
+

data/README.md

@@ -18,7 +18,7 @@ the University of Virginia Library and is made public under an Apache 2.0 licens
 
 ## Dependencies
 
-* ruby v1.8.7 or higher 
+* ruby v1.9.3 or higher 
 * git
 * java 1.5 or higher
 * access to a command prompt on the machine to install

data/VERSION

@@ -1 +1 @@
-3.8.2
+4.0.0.pre6

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

@@ -8,10 +8,19 @@
 //= require blacklight/bookmark_toggle
 //= require blacklight/facet_expand_contract
 //= require blacklight/lightbox_dialog
-//= require blacklight/more_facets
 //= require blacklight/search_context
 //= require blacklight/select_submit
 //= require blacklight/zebra_stripe
+//= require blacklight/bootstrap_dropdowns
+//= require blacklight/css_dropdowns
+//
+//Bootstrap JS for providing collapsable tablet/mobile menu/alert boxes
+//= require bootstrap-transition
+//= require bootstrap-collapse
+//= require bootstrap-alert
+//= require bootstrap-dropdown
+//= require improved-modal/bootstrap-modalmanager.js
+//= require improved-modal/bootstrap-modal.js
 
 /* Blacklight has a Javascript setup meant to support local disabling, 
   modification, and use of Blacklight behaviors. 
@@ -51,3 +60,5 @@
           });
         };
 */
+
+$('.no-js').removeClass('no-js')

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

@@ -0,0 +1,3 @@
+$(document).ready(function() {
+  $('.dropdown-toggle').dropdown();
+});

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

@@ -40,6 +40,7 @@
         //for both bookmarks/$doc_id.  But let's take out the irrelevant parts
         //of the form to avoid any future confusion. 
         form.find("input[type=submit]").remove();
+        form.addClass('form-inline');
         
         //View needs to set data-doc-id so we know a unique value
         //for making DOM id
@@ -53,9 +54,14 @@
           .attr("id", options.css_class + "_" + unique_id);	  
         var label = $('<label>')
           .addClass( options.css_class )
+          .addClass('checkbox')
           .attr("for", options.css_class + '_' + unique_id)
           .attr("title", form.attr("title") || "");
-          
+        var span = $('<span>');
+
+        label.append(checkbox);
+        label.append(" ");
+        label.append(span);  
           
         function update_state_for(state) {
             checkbox.attr("checked", state);
@@ -64,18 +70,19 @@
                //Set the Rails hidden field that fakes an HTTP verb
                //properly for current state action. 
                form.find("input[name=_method]").val("delete");
-               label.text(options.checked_label);
+               span.text(options.checked_label);
             } else {
                form.find("input[name=_method]").val("put");
-               label.text(options.unchecked_label);
+               span.text(options.unchecked_label);
             }
           }
         
-        form.append(checkbox).append(" ").append(label);
+        form.append(label);
         update_state_for(checked);
         
         checkbox.click(function() {
-            label.text(options.progress_label).attr("disabled", "disabled");  
+            span.text(options.progress_label);
+            label.attr("disabled", "disabled");  
             checkbox.attr("disabled", "disabled");
                             
             $.ajax({

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

@@ -1,2 +1 @@
-//= require jquery.uiExt.ajaxyDialog.js
 Blacklight = {};

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

@@ -0,0 +1,10 @@
+(function($) {
+	Blacklight.add_css_dropdown_click_support = function() {
+		$(".css-dropdown li:not(.no-menu)").on('click',function(){
+			$(this).toggleClass("hovering");
+		});
+	};
+	$(document).ready(function() {
+	  Blacklight.add_css_dropdown_click_support();
+	});
+})(jQuery);

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

@@ -5,7 +5,7 @@ Blacklight.do_facet_expand_contract_behavior = function() {
           Blacklight.facet_expand_contract
        );
     }
-    Blacklight.do_facet_expand_contract_behavior.selector = '#facets h3';
+    Blacklight.do_facet_expand_contract_behavior.selector = '#facets h5';
     	    
 	    /* Behavior that makes facet limit headings in sidebar expand/contract
 	       their contents. This is kind of fragile code targeted specifically
@@ -16,17 +16,17 @@ Blacklight.do_facet_expand_contract_behavior = function() {
      Blacklight.facet_expand_contract = function() {
        $(this).next("ul, div").each(function(){
            var f_content = $(this);
-           $(f_content).prev('h3').addClass('twiddle');
+           $(f_content).prev('h5').addClass('twiddle');
            // find all f_content's that don't have any span descendants with a class of "selected"
            if($('span.selected', f_content).length == 0){
              // hide it
              f_content.hide();
            } else {
-             $(this).prev('h3').addClass('twiddle-open');
+             $(this).prev('h5').addClass('twiddle-open');
            }
 
-           // attach the toggle behavior to the h3 tag
-           $('h3', f_content.parent()).click(function(){
+           // attach the toggle behavior to the h5 tag
+           $('h5', f_content.parent()).click(function(){
                // toggle the content
                $(this).toggleClass('twiddle-open');
                $(f_content).slideToggle();

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

@@ -1,16 +1,71 @@
 //= require blacklight/core
-(function($) {
-Blacklight.do_lightbox_dialog = function() {    
-      $("a.lightboxLink").ajaxyDialog({
-          chainAjaxySelector: false,
-          position: ['center', 50]
+Blacklight.setup_modal = function(link_selector, form_selector, launch_modal) {
+    $(link_selector).click(function(e) {
+      link = $(this)
+      
+      e.preventDefault();
+      if (launch_modal) {
+        GlobalModalManager.loading();
+      }
+
+      var jqxhr = $.ajax({
+        url: link.attr('href'),
+        dataType: 'script'
       });
-      //But make the librarian link wider than 300px default. 
-      $('a.lightboxLink#librarianLink').ajaxyDialog("option", "width", 650);
-      //And the email one too needs to be wider to fit the textarea
-      $("a.lightboxLink#emailLink").ajaxyDialog("option", "width", 500);
-    };
-$(document).ready(function() {
-  Blacklight.do_lightbox_dialog();  
+
+      jqxhr.always( function (data) {
+          if (data.statusText == "OK") {
+            $('#ajax-modal').html(data.responseText);
+            Blacklight.setup_modal('.modal-footer a', '#ajax-modal form.ajax_form', false);
+
+            if (launch_modal) {
+              $('#ajax-modal').modal();
+            }
+            Blacklight.check_close_ajax_modal();
+          }
+      });
+    });
+
+
+    $(form_selector).submit(function(e) {
+      var jqxhr = $.ajax({
+        url: $(this).attr('action'),
+        data: $(this).serialize(),
+        type: 'POST',
+        dataType: 'script'
+     });
+
+
+     jqxhr.always (function (data) {
+       if (data.statusText == "OK") {
+          $('#ajax-modal').html(data.responseText);
+          Blacklight.setup_modal('#ajax-modal .ajax_reload_link', '#ajax-modal form.ajax_form', false);
+          Blacklight.check_close_ajax_modal();
+       }
+     });
+
+
+      return false;
+
+
+    });
+};
+
+Blacklight.check_close_ajax_modal = function() {
+  if ($('#ajax-modal span.ajax-close-modal').length) {
+    modal_flashes = $('#ajax-modal .flash_messages');
+
+    main_flashes = $('#main-flashes .flash_messages:nth-of-type(1)');
+    $('#ajax-modal *[data-dismiss="modal"]:nth-of-type(1)').trigger('click');
+    main_flashes.append(modal_flashes);
+    modal_flashes.fadeIn(500);
+
+
+
+  }
+
+}
+
+$(document).ready( function() {
+  Blacklight.setup_modal("a.lightboxLink,a.more_facets_link,.ajax_modal_launch", "#ajax-modal form.ajax_form", true);
 });
-})(jQuery);

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

@@ -2,17 +2,26 @@
 (function($) {
 // Used for sort-by and per-page controls, hide the submit button
     // and make the select auto-submit
-    Blacklight.do_select_submit = function() {
-      $(Blacklight.do_select_submit.selector).each(function() {
-          var select = $(this);
-          select.closest("form").find("input[type=submit]").hide();
-          select.bind("change", function() {
-              this.form.submit();
-          });
+    Blacklight.update_css_dropdown = function(dropdown, prefix, suffix) {
+      $(dropdown).find('ul.css-dropdown ul a').click (function (e) {
+        selection_key = $(this).text();
+        
+        $(dropdown).find('ul.css-dropdown li.btn>a').html(prefix + selection_key + suffix);
       });
-    };
-    Blacklight.do_select_submit.selector = "form.sort select, form.per_page select";
+
+    }
+
 $(document).ready(function() {
-  Blacklight.do_select_submit();  
+  $('#sort-form').hide();
+  $('#sort-dropdown').show();
+  Blacklight.update_css_dropdown('#sort-dropdown', "Sort by ", "")
+  
+
+  $('#per_page-form').hide();
+  $('#per_page-dropdown').show();
+  Blacklight.update_css_dropdown('#per_page-dropdown', '', '')
+
+
+
 });
     })(jQuery);

data/app/assets/javascripts/improved-modal/bootstrap-modal.js

@@ -0,0 +1,282 @@
+/* ===========================================================
+ * bootstrap-modal.js 
+ * ===========================================================
+ * Copyright 2012 Jordan Schroter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+	"use strict"; // jshint ;_;
+	
+	/* MODAL CLASS DEFINITION
+	* ====================== */
+
+	var Modal = function (element, options) {
+		this.init(element, options);
+	}
+
+	Modal.prototype = {
+
+		constructor: Modal, 
+		
+		init: function(element, options){
+			this.options = options;
+		
+			this.$element = $(element)
+				.delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this));
+				
+			this.options.remote && this.$element.find('.modal-body').load(this.options.remote);
+			
+			var manager = typeof this.options.manager === 'function' ? this.options.manager.call(this) : this.options.manager;
+			manager && manager.appendModal && manager.appendModal(this);
+		}, 
+		
+		toggle: function () {
+			return this[!this.isShown ? 'show' : 'hide']();
+		}, 
+		
+		show: function () {
+			var that = this, 
+				e = $.Event('show');
+			
+			this.$element.triggerHandler(e);
+
+			if (e.isDefaultPrevented()) return;
+			
+			if (this.options.width){
+				this.$element.css('width', this.options.width);
+				
+				var that = this;
+				this.$element.css('margin-left', function(){
+					if (/%/ig.test(that.options.width)){
+						return -(parseInt(that.options.width) / 2) + '%';
+					} else {
+						return -($(this).width() / 2) + 'px';
+					}
+				});
+			}
+
+		
+			var prop = this.options.height ? 'height' : 'max-height';
+			var value = this.options.height || this.options.maxHeight;
+			
+			if (value){
+				this.$element.find('.modal-body')
+					.css('overflow', 'auto')
+					.css(prop, value);
+			}
+
+			this.escape();
+			
+			this.options.loading && this.loading();
+		}, 
+		
+		hide: function (e) {
+			e && e.preventDefault();
+
+			var that = this;
+
+			e = $.Event('hide');
+
+			this.$element.triggerHandler(e);
+
+			if (!this.isShown || e.isDefaultPrevented()) return (this.isShown = false);
+
+			this.isShown = false;
+
+			this.escape();
+			
+			this.isLoading && this.loading();
+
+			$(document).off('focusin.modal');
+
+			this.$element
+				.removeClass('in')
+				.removeClass('modal-overflow')
+				.attr('aria-hidden', true);
+
+			$.support.transition && this.$element.hasClass('fade') ?
+				this.hideWithTransition() :
+				this.hideModal();
+		}, 
+		
+		escape: function () {
+			var that = this;
+			if (this.isShown && this.options.keyboard) {
+				if (!this.$element.attr('tabindex')) this.$element.attr('tabindex', -1);
+				
+				this.$element.on('keyup.dismiss.modal', function ( e ) {
+					e.which == 27 && that.hide()
+				});
+			} else if (!this.isShown) {
+				this.$element.off('keyup.dismiss.modal')
+			}
+		}, 
+		
+		hideWithTransition: function () {
+			var that = this
+				, timeout = setTimeout(function () {
+					that.$element.off($.support.transition.end)
+					that.hideModal()
+				}, 500);
+
+			this.$element.one($.support.transition.end, function () {
+				clearTimeout(timeout)
+				that.hideModal()
+			});
+		}, 
+		
+		hideModal: function () {
+			this.$element
+				.hide()
+				.triggerHandler('hidden');
+
+
+			var prop = this.options.height ? 'height' : 'max-height';
+			var value = this.options.height || this.options.maxHeight;
+			
+			if (value){
+				this.$element.find('.modal-body')
+					.css('overflow', '')
+					.css(prop, '');
+			}
+
+		}, 
+		
+		removeLoading: function(){
+			this.$loading.remove();
+			this.$loading = null;
+			this.isLoading = false;
+		},
+		
+		loading: function(callback){
+			callback = callback || function(){};
+		
+			var animate = this.$element.hasClass('fade') ? 'fade' : '';
+			
+			if (!this.isLoading) {
+				var doAnimate = $.support.transition && animate;
+				
+				this.$loading = $('<div class="loading-mask ' + animate + '">')
+					.append(this.options.spinner)
+					.appendTo(this.$element);
+
+				if (doAnimate) this.$loading[0].offsetWidth // force reflow	
+					
+				this.$loading.addClass('in')
+
+				this.isLoading = true;
+				
+				doAnimate ?
+					this.$loading.one($.support.transition.end, callback) :
+					callback();
+
+			} else if (this.isLoading && this.$loading) {
+				this.$loading.removeClass('in');
+
+				var that = this;
+				$.support.transition && this.$element.hasClass('fade')?
+					this.$loading.one($.support.transition.end, function(){ that.removeLoading() }) :
+					that.removeLoading();
+
+			} else if (callback) {
+				callback(this.isLoading);
+			}
+		},
+		
+		toggleLoading: function(callback){ this.loading(callback); }, 
+		
+		destroy: function(){
+			var e = $.Event('destroy');
+			this.$element.triggerHandler(e);
+			if (e.isDefaultPrevented()) return;
+			
+			this.teardown();
+		},
+		
+		teardown: function(){
+			var $parent = this.$parent;
+			
+			if (!$parent.length){
+				this.$element.remove();
+				this.$element = null;
+				return;
+			}
+			
+			if ($parent !== this.$element.parent()){
+				this.$element.appendTo(this.$parent);
+			}
+			
+			this.$element.off('.modal');
+			this.$element.removeData('modal');
+			this.$element
+				.removeClass('in')
+				.attr('aria-hidden', true);
+		}
+	}
+
+
+	/* MODAL PLUGIN DEFINITION
+	* ======================= */
+
+	$.fn.modal = function (option) {
+		return this.each(function () {
+			var $this = $(this), 
+				data = $this.data('modal'), 
+				options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option);
+
+			if (!data) $this.data('modal', (data = new Modal(this, options)))
+			if (typeof option == 'string') data[option]()
+			else if (options.show) data.show()
+		})
+	}
+
+	$.fn.modal.defaults = {
+		keyboard: true, 
+		backdrop: true,
+		loading: false,
+		show: true,
+		width: null,
+		height: null,
+		maxHeight: null,
+		modalOverflow: false,
+		manager: function(){ return GlobalModalManager },
+		spinner: '<div class="loading-spinner" style="width: 200px; margin-left: -100px;"><div class="progress progress-striped active"><div class="bar" style="width: 100%;"></div></div></div>'
+	}
+
+	$.fn.modal.Constructor = Modal
+
+
+	/* MODAL DATA-API
+	* ============== */
+	
+	$(function () {
+		$(document).off('.modal').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
+			var $this = $(this), 
+				href = $this.attr('href'), 
+				$target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))), //strip for ie7 
+				option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data());
+
+			e.preventDefault();
+			$target
+				.modal(option)
+				.one('hide', function () {
+					$this.focus();
+				})
+		});
+	});
+
+}(window.jQuery);