Merge branch 'release-3.1'

themes/bootstrap3/js/cart.js

@@ -176,7 +176,7 @@ VuFind.register('cart', function Cart() {
         var $parent = $(this).parent();
         $parent.find('.cart-add.correct,.cart-remove.correct').removeClass('correct hidden');
         $parent.find('.cart-add').click(function cartAddClick() {
-          if(addItem(currentId, currentSource)) {
+          if (addItem(currentId, currentSource)) {
             $parent.find('.cart-add,.cart-remove').toggleClass('hidden');
           } else {
             $parent.popover({content: VuFind.translate('bookbagFull')});

themes/bootstrap3/js/hold.js

@@ -24,8 +24,8 @@ function setUpHoldRequestForm(recordId) {
       var defaultValue = $('#pickUpLocation').data('default');
       $.each(response.data.locations, function holdPickupLocationEach() {
         var option = $('<option></option>').attr('value', this.locationID).text(this.locationDisplay);
-        // Weak comparison between locationID and defaultValue since locationID may be an integer 
-        if (this.locationID == defaultValue || (defaultValue === '' && this.isDefault && $emptyOption.length === 0)) {
+        // Weak comparison between locationID and defaultValue since locationID may be an integer
+        if (this.locationID === defaultValue || (defaultValue === '' && this.isDefault && $emptyOption.length === 0)) {
           option.attr('selected', 'selected');
         }
         $('#pickUpLocation').append(option);