From 049c0f8054c9b1c38c60ec7841c3dfe47040b257 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Wed, 21 Sep 2016 17:56:07 -0400
Subject: [PATCH 01/21] Add polyfill.

---
 .../js/vendor/form-attr-polyfill.js           | 77 +++++++++++++++++++
 themes/bootstrap3/theme.config.php            |  1 +
 2 files changed, 78 insertions(+)
 create mode 100644 themes/bootstrap3/js/vendor/form-attr-polyfill.js

diff --git a/themes/bootstrap3/js/vendor/form-attr-polyfill.js b/themes/bootstrap3/js/vendor/form-attr-polyfill.js
new file mode 100644
index 00000000000..6a22acd5e51
--- /dev/null
+++ b/themes/bootstrap3/js/vendor/form-attr-polyfill.js
@@ -0,0 +1,77 @@
+/**
+ * From http://stackoverflow.com/questions/17742275/polyfill-html5-input-form-attribute/26696165#26696165
+ * Recommended by https://github.com/Modernizr/Modernizr/wiki/HTML5-Cross-browser-Polyfills
+ * Adapted to eslint styling and updated detection by Chris Hallberg (@crhallberg) for VuFind
+ */
+(function formAttrPolyfill($) {
+  /**
+   * polyfill for html5 form attr
+   */
+
+  // every browser supports except IE
+  if (typeof document.documentMode == 'undefined') {
+    // any other browser? skip
+    return;
+  }
+
+  /**
+   * Append a field to a form
+   *
+   */
+  $.fn.appendField = function appendField(_data) {
+    var data = (!$.isArray(data) && data.name && data.value)
+      ? [_data] // wrap data
+      : _data;
+
+    // for form only
+    if (!this.is('form')) {
+      return;
+    }
+
+    var $form = this;
+
+    // attach new params
+    $.each(data, function appendFieldEach(i, item) {
+      $('<input/>')
+        .attr('type', 'hidden')
+        .attr('name', item.name)
+        .val(item.value).appendTo($form);
+    });
+
+    return $form;
+  };
+
+  /**
+   * Find all input fields with form attribute point to jQuery object
+   *
+   */
+  $('form[id]').submit(function locateFormAttr(/*e*/) {
+    // serialize data
+    var data = $('[form=' + this.id + ']').serializeArray();
+    // append data to form
+    $(this).appendField(data);
+  }).each(function locateFormAttrEach() {
+    var form = this,
+      $fields = $('[form=' + this.id + ']');
+
+    $fields.filter('button, input').filter('[type=reset],[type=submit]').click(function formAttrButtonSubmit() {
+      var type = this.type.toLowerCase();
+      if (type === 'reset') {
+        // reset form
+        form.reset();
+        // for elements outside form
+        $fields.each(function formAttrGatherFieldData() {
+          this.value = this.defaultValue;
+          this.checked = this.defaultChecked;
+        }).filter('select').each(function formAttrGatherSelectData() {
+          $(this).find('option').each(function formAttrGatherOptionData() {
+            this.selected = this.defaultSelected;
+          });
+        });
+      } else if (type.match(/^submit|image$/i)) {
+        $(form).appendField({name: this.name, value: this.value}).submit();
+      }
+    });
+  });
+
+})(jQuery);
diff --git a/themes/bootstrap3/theme.config.php b/themes/bootstrap3/theme.config.php
index 8ee821b92db..e94e89b7487 100644
--- a/themes/bootstrap3/theme.config.php
+++ b/themes/bootstrap3/theme.config.php
@@ -15,6 +15,7 @@
         'vendor/bootstrap.min.js',
         'vendor/bootstrap-accessibility.min.js',
         'vendor/validator.min.js',
+        'vendor/form-attr-polyfill.js', // input[form] polyfill, cannot load conditionally, since we need all versions of IE
         'autocomplete.js',
         'common.js',
         'lightbox.js',

From 791a0a8863ec3dd244cddb44926204713d9e05d3 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Wed, 21 Sep 2016 18:41:28 -0400
Subject: [PATCH 02/21] Add form attributes to bottom buttons and checkboxes in
 search.

---
 module/VuFind/src/VuFind/View/Helper/Root/Record.php |  6 +++++-
 themes/bootstrap3/templates/record/checkbox.phtml    |  4 ++--
 .../templates/search/bulk-action-buttons.phtml       | 12 ++++++------
 themes/bootstrap3/templates/search/list-list.phtml   |  4 ++--
 themes/bootstrap3/templates/search/results.phtml     |  8 ++++----
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/module/VuFind/src/VuFind/View/Helper/Root/Record.php b/module/VuFind/src/VuFind/View/Helper/Root/Record.php
index 1054069909e..7dd53c668dd 100644
--- a/module/VuFind/src/VuFind/View/Helper/Root/Record.php
+++ b/module/VuFind/src/VuFind/View/Helper/Root/Record.php
@@ -410,16 +410,20 @@ public function getSearchResult($view)
      * Render an HTML checkbox control for the current record.
      *
      * @param string $idPrefix Prefix for checkbox HTML ids
+     * @param string $formAttr ID of form for [form] attribute
      *
      * @return string
      */
-    public function getCheckbox($idPrefix = '')
+    public function getCheckbox($idPrefix = '', $formAttr = false)
     {
         static $checkboxCount = 0;
         $id = $this->driver->getSourceIdentifier() . '|'
             . $this->driver->getUniqueId();
         $context
             = ['id' => $id, 'count' => $checkboxCount++, 'prefix' => $idPrefix];
+        if ($formAttr) {
+            $context['formAttr'] = $formAttr;
+        }
         return $this->contextHelper->renderInContext(
             'record/checkbox.phtml', $context
         );
diff --git a/themes/bootstrap3/templates/record/checkbox.phtml b/themes/bootstrap3/templates/record/checkbox.phtml
index e6cba3addf1..f889038dbba 100644
--- a/themes/bootstrap3/templates/record/checkbox.phtml
+++ b/themes/bootstrap3/templates/record/checkbox.phtml
@@ -1,2 +1,2 @@
-<input class="checkbox-select-item" type="checkbox" name="ids[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"/>
-<input type="hidden" name="idsAll[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"/>
+<input class="checkbox-select-item" type="checkbox" name="ids[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"<? if(isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<? endif; ?>/>
+<input type="hidden" name="idsAll[]" value="<?=$this->escapeHtmlAttr($this->id) ?>"<? if(isset($this->formAttr)): ?> form="<?=$this->formAttr ?>"<? endif; ?>/>
diff --git a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
index 7122165f7c6..f19c97b3441 100644
--- a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
+++ b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
@@ -3,23 +3,23 @@
   <div class="bulkActionButtons hidden-print">
     <div class="checkbox">
       <label>
-        <input type="checkbox" class="checkbox-select-all" name="selectAll" id="<?=$this->idPrefix?>addFormCheckboxSelectAll"/> <?=$this->transEsc('select_page')?>
+        <input type="checkbox" class="checkbox-select-all" name="selectAll" id="<?=$this->idPrefix?>addFormCheckboxSelectAll"<?if($this->idPrefix):?> form="search-cart-form"<? endif; ?>/> <?=$this->transEsc('select_page')?>
         &#124; <?=$this->transEsc('with_selected')?>:
       </label>
     </div>
     <div class="btn-group">
       <? if (isset($this->showBulkOptions) && $this->showBulkOptions): ?>
-        <input id="ribbon-email" class="btn btn-default" type="submit" name="email" title="<?=$this->transEsc('bookbag_email_selected')?>" value="<?=$this->transEsc('Email')?>"/>
+        <input id="ribbon-email" class="btn btn-default" type="submit" name="email" title="<?=$this->transEsc('bookbag_email_selected')?>" value="<?=$this->transEsc('Email')?>"<?if($this->idPrefix):?> form="search-cart-form"<? endif; ?>/>
         <? $exportOptions = $this->export()->getBulkOptions(); if (count($exportOptions) > 0): ?>
-          <input id="ribbon-export" class="btn btn-default" type="submit" name="export" title="<?=$this->transEsc('bookbag_export_selected')?>" value="<?=$this->transEsc('Export')?>"/>
+          <input id="ribbon-export" class="btn btn-default" type="submit" name="export" title="<?=$this->transEsc('bookbag_export_selected')?>" value="<?=$this->transEsc('Export')?>"<?if($this->idPrefix):?> form="search-cart-form"<? endif; ?>/>
         <? endif; ?>
-        <input id="ribbon-print" class="btn btn-default" type="submit" name="print" title="<?=$this->transEsc('bookbag_print_selected')?>" value="<?=$this->transEsc('Print')?>"/>
+        <input id="ribbon-print" class="btn btn-default" type="submit" name="print" title="<?=$this->transEsc('bookbag_print_selected')?>" value="<?=$this->transEsc('Print')?>"<?if($this->idPrefix):?> form="search-cart-form"<? endif; ?>/>
         <? if ($this->userlist()->getMode() !== 'disabled'): ?>
-          <input id="ribbon-save" class="btn btn-default" type="submit" name="saveCart" title="<?=$this->transEsc('bookbag_save_selected')?>" value="<?=$this->transEsc('Save')?>"/>
+          <input id="ribbon-save" class="btn btn-default" type="submit" name="saveCart" title="<?=$this->transEsc('bookbag_save_selected')?>" value="<?=$this->transEsc('Save')?>"<?if($this->idPrefix):?> form="search-cart-form"<? endif; ?>/>
         <? endif; ?>
       <? endif; ?>
       <? if (isset($this->showCartControls) && $this->showCartControls): ?>
-        <input id="<?=$this->idPrefix?>updateCart" type="submit" class="btn btn-default" name="add" value="<?=$this->transEsc('Add to Book Bag')?>"/>
+        <input id="<?=$this->idPrefix?>updateCart" type="submit" class="btn btn-default" name="add" value="<?=$this->transEsc('Add to Book Bag')?>"<?if($this->idPrefix):?> form="search-cart-form"<? endif; ?>/>
       <? endif; ?>
     </div>
   </div>
diff --git a/themes/bootstrap3/templates/search/list-list.phtml b/themes/bootstrap3/templates/search/list-list.phtml
index b6adf0cd9e9..a01cfdd9541 100644
--- a/themes/bootstrap3/templates/search/list-list.phtml
+++ b/themes/bootstrap3/templates/search/list-list.phtml
@@ -7,7 +7,7 @@
     <div class="checkbox hidden-print">
       <? if ($showCheckboxes): ?>
         <label>
-          <?=$this->record($current)->getCheckbox()?>
+          <?=$this->record($current)->getCheckbox('', 'search-cart-form')?>
           <?=$recordNumber ?>
         </label>
       <? else: ?>
@@ -16,4 +16,4 @@
     </div>
     <?=$this->record($current)->getSearchResult('list')?>
   </div>
-<? endforeach; ?>
\ No newline at end of file
+<? endforeach; ?>
diff --git a/themes/bootstrap3/templates/search/results.phtml b/themes/bootstrap3/templates/search/results.phtml
index c0fb8203084..5583dbf9843 100644
--- a/themes/bootstrap3/templates/search/results.phtml
+++ b/themes/bootstrap3/templates/search/results.phtml
@@ -109,12 +109,12 @@
         <? endif; ?>
       <? endforeach; ?>
     <? else: ?>
-      <form class="form-inline" method="post" name="bulkActionForm" action="<?=$this->url('cart-searchresultsbulk')?>" data-lightbox data-lightbox-onsubmit="bulkFormHandler">
+      <form id="search-cart-form" class="form-inline" method="post" name="bulkActionForm" action="<?=$this->url('cart-searchresultsbulk')?>" data-lightbox data-lightbox-onsubmit="bulkFormHandler">
         <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', array('idPrefix' => ''))?>
-        <?=$this->render('search/list-' . $this->params->getView() . '.phtml')?>
-        <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', array('idPrefix' => 'bottom_'))?>
-        <?=$this->paginationControl($this->results->getPaginator(), 'Sliding', 'search/pagination.phtml', array('results' => $this->results, 'options' => isset($this->paginationOptions) ? $this->paginationOptions : []))?>
       </form>
+      <?=$this->render('search/list-' . $this->params->getView() . '.phtml')?>
+      <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', array('idPrefix' => 'bottom_'))?>
+      <?=$this->paginationControl($this->results->getPaginator(), 'Sliding', 'search/pagination.phtml', array('results' => $this->results, 'options' => isset($this->paginationOptions) ? $this->paginationOptions : []))?>
 
       <div class="searchtools hidden-print">
         <strong><?=$this->transEsc('Search Tools')?>:</strong>

From 67d5f0c9cdb11653a2144085187bc2f16580cdde Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Wed, 21 Sep 2016 18:52:08 -0400
Subject: [PATCH 03/21] Adjust checkbox-select-all to allow for [form]
 attributes.

---
 themes/bootstrap3/js/common.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/themes/bootstrap3/js/common.js b/themes/bootstrap3/js/common.js
index 0380d9ea3b8..801616a2c5a 100644
--- a/themes/bootstrap3/js/common.js
+++ b/themes/bootstrap3/js/common.js
@@ -303,10 +303,20 @@ $(document).ready(function commonDocReady() {
 
   // Checkbox select all
   $('.checkbox-select-all').change(function selectAllCheckboxes() {
-    $(this).closest('form').find('.checkbox-select-item').prop('checked', this.checked);
+    var $form = $(this).closest('form')
+    $form.find('.checkbox-select-item').prop('checked', this.checked);
+    $('[form="'+$form.attr('id')+'"]').prop('checked', this.checked);
   });
   $('.checkbox-select-item').change(function selectAllDisable() {
-    $(this).closest('form').find('.checkbox-select-all').prop('checked', false);
+    var $form = $(this).closest('form');
+    if ($form.length === 0 && this.form) {
+      $form = $(this.form);
+    }
+    if ($form.length === 0) {
+      return;
+    }
+    $form.find('.checkbox-select-all').prop('checked', false);
+    $('.checkbox-select-all[form="'+$form.attr('id')+'"]').prop('checked', false);
   });
 
   // handle QR code links

From fc0e2bc737483565a12a20905b56e804439dbd63 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Thu, 22 Sep 2016 10:59:12 -0400
Subject: [PATCH 04/21] Adjust unit test.

---
 .../unit-tests/src/VuFindTest/View/Helper/Root/RecordTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/RecordTest.php b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/RecordTest.php
index 32434ba4980..33121548b7d 100644
--- a/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/RecordTest.php
+++ b/module/VuFind/tests/unit-tests/src/VuFindTest/View/Helper/Root/RecordTest.php
@@ -271,10 +271,10 @@ public function testGetCheckbox()
     {
         $context = $this->getMockContext();
         $context->expects($this->at(1))->method('renderInContext')
-            ->with($this->equalTo('record/checkbox.phtml'), $this->equalTo(['id' => 'Solr|000105196', 'count' => 0, 'prefix' => 'bar']))
+            ->with($this->equalTo('record/checkbox.phtml'), $this->equalTo(['id' => 'Solr|000105196', 'count' => 0, 'prefix' => 'bar', 'formAttr' => 'foo']))
             ->will($this->returnValue('success'));
         $context->expects($this->at(2))->method('renderInContext')
-            ->with($this->equalTo('record/checkbox.phtml'), $this->equalTo(['id' => 'Solr|000105196', 'count' => 1, 'prefix' => 'bar']))
+            ->with($this->equalTo('record/checkbox.phtml'), $this->equalTo(['id' => 'Solr|000105196', 'count' => 1, 'prefix' => 'bar', 'formAttr' => 'foo']))
             ->will($this->returnValue('success'));
         $record = $this->getRecord(
             $this->loadRecordFixture('testbug1.json'), [], $context

From 246b2c4b3993f795d3552c8c7bb851d5c7ad5f56 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Thu, 22 Sep 2016 11:03:49 -0400
Subject: [PATCH 05/21] Remove magic script form retention hack.

---
 module/VuFind/src/VuFind/Service/ReCaptcha.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/VuFind/src/VuFind/Service/ReCaptcha.php b/module/VuFind/src/VuFind/Service/ReCaptcha.php
index 2a8ff092584..a8152779436 100644
--- a/module/VuFind/src/VuFind/Service/ReCaptcha.php
+++ b/module/VuFind/src/VuFind/Service/ReCaptcha.php
@@ -66,7 +66,7 @@ public function getHtml($name = null)
         $divregex = '/<div[^>]*id=[\'"]recaptcha_widget[\'"][^>]*>/';
 
         $scriptRegex = '|<script[^>]*></script>|';
-        $scriptReplacement = '<script>/*form magic*/</script>';
+        $scriptReplacement = ''; // remove
 
         return preg_replace(
             [$divregex, $scriptRegex],

From 233e16fcd31e06267f65725b6421cc57be0426a4 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Thu, 22 Sep 2016 11:14:55 -0400
Subject: [PATCH 06/21] Expand _clickedButton logic in lightbox to include
 [form] attrs.

---
 themes/bootstrap3/js/lightbox.js                            | 6 +++++-
 .../bootstrap3/templates/search/bulk-action-buttons.phtml   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/themes/bootstrap3/js/lightbox.js b/themes/bootstrap3/js/lightbox.js
index 350dc71f491..e2a1a79252f 100644
--- a/themes/bootstrap3/js/lightbox.js
+++ b/themes/bootstrap3/js/lightbox.js
@@ -299,7 +299,11 @@ VuFind.register('lightbox', function Lightbox() {
     // Handle submit buttons attached to a form as well as those in a form. Store
     // information about which button was clicked here as checking focused button
     // doesn't work on all browsers and platforms.
-    $('form[data-lightbox] [type=submit]').click(_storeClickedStatus);
+    $('form[data-lightbox]').each(function bindFormSubmitsLightbox(i, form) {
+      console.log(form);
+      $(form).find('[type=submit]').click(_storeClickedStatus);
+      $('[type="submit"][form="' + form.id + '"]').click(_storeClickedStatus);
+    });
   }
 
   function reset() {
diff --git a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
index f19c97b3441..f5950621ff5 100644
--- a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
+++ b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
@@ -1,6 +1,6 @@
 <? if((isset($this->showBulkOptions)  && $this->showBulkOptions)
    || (isset($this->showCartControls) && $this->showCartControls)): ?>
-  <div class="bulkActionButtons hidden-print">
+  <div class="bulkActionButtons hidden-print<?if($this->idPrefix):?> form-inline<? endif; ?>">
     <div class="checkbox">
       <label>
         <input type="checkbox" class="checkbox-select-all" name="selectAll" id="<?=$this->idPrefix?>addFormCheckboxSelectAll"<?if($this->idPrefix):?> form="search-cart-form"<? endif; ?>/> <?=$this->transEsc('select_page')?>

From ecdf8f0767f2f86e1c52b09ac17139ad5d0d457b Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Thu, 22 Sep 2016 11:24:03 -0400
Subject: [PATCH 07/21] Eslint. Remove console.log.

---
 themes/bootstrap3/js/common.js   | 4 ++--
 themes/bootstrap3/js/lightbox.js | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/themes/bootstrap3/js/common.js b/themes/bootstrap3/js/common.js
index f22b93be68a..ea2fc6563bd 100644
--- a/themes/bootstrap3/js/common.js
+++ b/themes/bootstrap3/js/common.js
@@ -307,7 +307,7 @@ $(document).ready(function commonDocReady() {
   $('.checkbox-select-all').change(function selectAllCheckboxes() {
     var $form = $(this).closest('form')
     $form.find('.checkbox-select-item').prop('checked', this.checked);
-    $('[form="'+$form.attr('id')+'"]').prop('checked', this.checked);
+    $('[form="' + $form.attr('id') + '"]').prop('checked', this.checked);
   });
   $('.checkbox-select-item').change(function selectAllDisable() {
     var $form = $(this).closest('form');
@@ -318,7 +318,7 @@ $(document).ready(function commonDocReady() {
       return;
     }
     $form.find('.checkbox-select-all').prop('checked', false);
-    $('.checkbox-select-all[form="'+$form.attr('id')+'"]').prop('checked', false);
+    $('.checkbox-select-all[form="' + $form.attr('id') + '"]').prop('checked', false);
   });
 
   // handle QR code links
diff --git a/themes/bootstrap3/js/lightbox.js b/themes/bootstrap3/js/lightbox.js
index e2a1a79252f..01bb250f90e 100644
--- a/themes/bootstrap3/js/lightbox.js
+++ b/themes/bootstrap3/js/lightbox.js
@@ -300,7 +300,6 @@ VuFind.register('lightbox', function Lightbox() {
     // information about which button was clicked here as checking focused button
     // doesn't work on all browsers and platforms.
     $('form[data-lightbox]').each(function bindFormSubmitsLightbox(i, form) {
-      console.log(form);
       $(form).find('[type=submit]').click(_storeClickedStatus);
       $('[type="submit"][form="' + form.id + '"]').click(_storeClickedStatus);
     });

From 9b5572ebf32573208cf3b1d5a318a9e7486c74d7 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Thu, 22 Sep 2016 12:21:47 -0400
Subject: [PATCH 08/21] grecaptcha reset fix.

---
 themes/bootstrap3/js/lightbox.js |  5 ++++-
 themes/bootstrap3/js/record.js   | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/themes/bootstrap3/js/lightbox.js b/themes/bootstrap3/js/lightbox.js
index ffe317ca89a..49e22aec8e1 100644
--- a/themes/bootstrap3/js/lightbox.js
+++ b/themes/bootstrap3/js/lightbox.js
@@ -278,7 +278,10 @@ VuFind.register('lightbox', function Lightbox() {
       data: data
     }).done(function recaptchaReset() {
       if (typeof grecaptcha !== 'undefined') {
-        grecaptcha.reset($(form).find('.g-recaptcha').data('captchaId'));
+        var captcha = $(form).find('.g-recaptcha');
+        if (captcha.length > 0) {
+          grecaptcha.reset(captcha.data('captchaId'));
+        }
       }
     });
 
diff --git a/themes/bootstrap3/js/record.js b/themes/bootstrap3/js/record.js
index f247c3a631f..eea4f8a5103 100644
--- a/themes/bootstrap3/js/record.js
+++ b/themes/bootstrap3/js/record.js
@@ -79,7 +79,10 @@ function refreshCommentList($target, recordId, recordSource) {
     });
     $target.find('.comment-form input[type="submit"]').button('reset');
     if (typeof grecaptcha !== 'undefined') {
-      grecaptcha.reset();
+      var captcha = $target.find('.g-recaptcha');
+      if (captcha.length > 0) {
+        grecaptcha.reset(captcha.data('captchaId'));
+      }
     }
   });
 }
@@ -114,7 +117,10 @@ function registerAjaxCommentRecord() {
       $(form).find('textarea[name="comment"]').val('');
       $(form).find('input[type="submit"]').button('loading');
       if (typeof grecaptcha !== 'undefined') {
-        grecaptcha.reset($(form).find('.g-recaptcha').data('captchaId'));
+        var captcha = $(form).find('.g-recaptcha');
+        if (captcha.length > 0) {
+          grecaptcha.reset(captcha.data('captchaId'));
+        }
       }
     })
     .fail(function addCommentFail(response, textStatus) {

From ceeb2a624edac373ce981b9ea282d0ab0da15d86 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Thu, 22 Sep 2016 12:22:00 -0400
Subject: [PATCH 09/21] Polyfill fixed to run on document ready.

---
 .../js/vendor/form-attr-polyfill.js           | 103 +++++++++---------
 1 file changed, 52 insertions(+), 51 deletions(-)

diff --git a/themes/bootstrap3/js/vendor/form-attr-polyfill.js b/themes/bootstrap3/js/vendor/form-attr-polyfill.js
index 6a22acd5e51..56dddadfc6a 100644
--- a/themes/bootstrap3/js/vendor/form-attr-polyfill.js
+++ b/themes/bootstrap3/js/vendor/form-attr-polyfill.js
@@ -14,63 +14,64 @@
     return;
   }
 
-  /**
-   * Append a field to a form
-   *
-   */
-  $.fn.appendField = function appendField(_data) {
-    var data = (!$.isArray(data) && data.name && data.value)
-      ? [_data] // wrap data
-      : _data;
-
-    // for form only
-    if (!this.is('form')) {
-      return;
-    }
+  $(document).ready(function formAttrReady() {
+    /**
+     * Append a field to a form
+     *
+     */
+    $.fn.appendField = function appendField(_data) {
+      var data = (!$.isArray(_data) && _data.name && _data.value)
+        ? [_data] // wrap data
+        : _data;
+      // for form only
+      if (!this.is('form')) {
+        return;
+      }
 
-    var $form = this;
+      var $form = this;
 
-    // attach new params
-    $.each(data, function appendFieldEach(i, item) {
-      $('<input/>')
-        .attr('type', 'hidden')
-        .attr('name', item.name)
-        .val(item.value).appendTo($form);
-    });
+      // attach new params
+      $.each(data, function appendFieldEach(i, item) {
+        $('<input/>')
+          .attr('type', 'hidden')
+          .attr('name', item.name)
+          .val(item.value).appendTo($form);
+      });
 
-    return $form;
-  };
+      return $form;
+    };
 
-  /**
-   * Find all input fields with form attribute point to jQuery object
-   *
-   */
-  $('form[id]').submit(function locateFormAttr(/*e*/) {
-    // serialize data
-    var data = $('[form=' + this.id + ']').serializeArray();
-    // append data to form
-    $(this).appendField(data);
-  }).each(function locateFormAttrEach() {
-    var form = this,
-      $fields = $('[form=' + this.id + ']');
+    /**
+     * Find all input fields with form attribute point to jQuery object
+     *
+     */
+    $('form[id]').submit(function locateFormAttr(/*e*/) {
+      // serialize data
+      var data = $('[form=' + this.id + ']').serializeArray();
+      // append data to form
+      $(this).appendField(data);
+    }).each(function locateFormAttrEach() {
+      var form = this,
+        $fields = $('[form=' + this.id + ']');
 
-    $fields.filter('button, input').filter('[type=reset],[type=submit]').click(function formAttrButtonSubmit() {
-      var type = this.type.toLowerCase();
-      if (type === 'reset') {
-        // reset form
-        form.reset();
-        // for elements outside form
-        $fields.each(function formAttrGatherFieldData() {
-          this.value = this.defaultValue;
-          this.checked = this.defaultChecked;
-        }).filter('select').each(function formAttrGatherSelectData() {
-          $(this).find('option').each(function formAttrGatherOptionData() {
-            this.selected = this.defaultSelected;
+      $fields.filter('button, input').filter('[type=reset],[type=submit]').click(function formAttrButtonSubmit() {
+        var type = this.type.toLowerCase();
+        if (type === 'reset') {
+          // reset form
+          form.reset();
+          // for elements outside form
+          $fields.each(function formAttrGatherFieldData() {
+            this.value = this.defaultValue;
+            this.checked = this.defaultChecked;
+          }).filter('select').each(function formAttrGatherSelectData() {
+            $(this).find('option').each(function formAttrGatherOptionData() {
+              this.selected = this.defaultSelected;
+            });
           });
-        });
-      } else if (type.match(/^submit|image$/i)) {
-        $(form).appendField({name: this.name, value: this.value}).submit();
-      }
+        } else if (type.match(/^submit|image$/i)) {
+          $(form).appendField({name: this.name, value: this.value}).submit();
+        }
+      });
     });
   });
 

From b2287152d747c31c7f1bce4228c15043ccb81b8e Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 26 Sep 2016 11:52:28 -0400
Subject: [PATCH 10/21] removed <script> hack

---
 themes/bootstrap3/templates/RecordTab/usercomments.phtml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/themes/bootstrap3/templates/RecordTab/usercomments.phtml b/themes/bootstrap3/templates/RecordTab/usercomments.phtml
index e00d5eaaffc..4bd7cb6e88b 100644
--- a/themes/bootstrap3/templates/RecordTab/usercomments.phtml
+++ b/themes/bootstrap3/templates/RecordTab/usercomments.phtml
@@ -19,8 +19,6 @@
         <textarea name="comment" class="form-control" rows="3" required></textarea><br/>
         <? if ($this->tab->isRecaptchaActive()): ?>
           <?=$this->recaptcha()->html(true, false) ?><br/>
-        <? else: ?>
-          <script>/* workaround for nested form bug */</script>
         <? endif; ?>
         <input class="btn btn-primary" data-loading-text="<?=$this->transEsc('Submitting') ?>..." type="submit" value="<?=$this->transEsc("Add your comment")?>"/>
       <? else: ?>

From 655f8c961beab1dc0c0c1770035d4f899b4442d9 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Tue, 27 Sep 2016 13:53:17 -0400
Subject: [PATCH 11/21] Find form attributed checkboxes as well for search cart
 adding.

---
 themes/bootstrap3/js/cart.js | 90 ++++++++++++++++++------------------
 1 file changed, 46 insertions(+), 44 deletions(-)

diff --git a/themes/bootstrap3/js/cart.js b/themes/bootstrap3/js/cart.js
index dd768ea40c1..b0a3a4ff778 100644
--- a/themes/bootstrap3/js/cart.js
+++ b/themes/bootstrap3/js/cart.js
@@ -115,52 +115,55 @@ VuFind.register('cart', function Cart() {
 
   var _cartNotificationTimeout = false;
   function _registerUpdate($form) {
-    if ($form) {
-      $("#updateCart, #bottom_updateCart").unbind('click').click(function cartUpdate(){
-        var elId = this.id;
-        var selectedBoxes = $("input[name='ids[]']:checked", $form);
-        var selected = [];
-        $(selectedBoxes).each(function cartCheckboxValues(i) {
-          selected[i] = this.value;
-        });
-        if (selected.length > 0) {
-          var inCart = 0;
-          var msg = "";
-          var orig = getFullItems();
-          $(selected).each(function cartCheckedItemsAdd() {
-            for (var x in orig) {
-              if (this === orig[x]) {
-                inCart++;
-                return;
-              }
+    var $form = $('form[name="bulkActionForm"]');
+    $("#updateCart, #bottom_updateCart").unbind('click').click(function cartUpdate(){
+      var elId = this.id;
+      var selected = [];
+      var selectedInForm = $form.find('input[name="ids[]"]:checked');
+      var selectedFormAttr = $('input[form="' + $form.attr('id') + '"][name="ids[]"]:checked');
+      $(selectedInForm).each(function cartFormCheckboxValues() {
+        selected.push(this.value);
+      });
+      $(selectedFormAttr).each(function cartAttrCheckboxValues() {
+        selected.push(this.value);
+      });
+      if (selected.length > 0) {
+        var inCart = 0;
+        var msg = "";
+        var orig = getFullItems();
+        $(selected).each(function cartCheckedItemsAdd() {
+          for (var x in orig) {
+            if (this === orig[x]) {
+              inCart++;
+              return;
             }
-            var data = this.split('|');
-            addItem(data[1], data[0]);
-          });
-          var updated = getFullItems();
-          var added = updated.length - orig.length;
-          msg += added + " " + VuFind.translate('itemsAddBag');
-          if (inCart > 0 && orig.length > 0) {
-            msg += "<br/>" + inCart + " " + VuFind.translate('itemsInBag');
           }
-          if (updated.length >= VuFind.translate('bookbagMax')) {
-            msg += "<br/>" + VuFind.translate('bookbagFull');
-          }
-          $('#' + elId).data('bs.popover').options.content = msg;
-          $('#cartItems strong').html(updated.length);
-        } else {
-          $('#' + elId).data('bs.popover').options.content = VuFind.translate('bulk_noitems_advice');
+          var data = this.split('|');
+          addItem(data[1], data[0]);
+        });
+        var updated = getFullItems();
+        var added = updated.length - orig.length;
+        msg += added + " " + VuFind.translate('itemsAddBag');
+        if (inCart > 0 && orig.length > 0) {
+          msg += "<br/>" + inCart + " " + VuFind.translate('itemsInBag');
         }
-        $('#' + elId).popover('show');
-        if (_cartNotificationTimeout !== false) {
-          clearTimeout(_cartNotificationTimeout);
+        if (updated.length >= VuFind.translate('bookbagMax')) {
+          msg += "<br/>" + VuFind.translate('bookbagFull');
         }
-        _cartNotificationTimeout = setTimeout(function notificationHide() {
-          $('#' + elId).popover('hide');
-        }, 5000);
-        return false;
-      });
-    }
+        $('#' + elId).data('bs.popover').options.content = msg;
+        $('#cartItems strong').html(updated.length);
+      } else {
+        $('#' + elId).data('bs.popover').options.content = VuFind.translate('bulk_noitems_advice');
+      }
+      $('#' + elId).popover('show');
+      if (_cartNotificationTimeout !== false) {
+        clearTimeout(_cartNotificationTimeout);
+      }
+      _cartNotificationTimeout = setTimeout(function notificationHide() {
+        $('#' + elId).popover('hide');
+      }, 5000);
+      return false;
+    });
   }
 
   function init() {
@@ -184,8 +187,7 @@ VuFind.register('cart', function Cart() {
       });
     } else {
       // Search results
-      var $form = $('form[name="bulkActionForm"]');
-      _registerUpdate($form);
+      _registerUpdate();
     }
     $("#updateCart, #bottom_updateCart").popover({content: '', html: true, trigger: 'manual'});
   }

From 26db220b2ef712f68702f606296de54d4ba01b81 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Tue, 27 Sep 2016 14:39:22 -0400
Subject: [PATCH 12/21] eslint

---
 themes/bootstrap3/js/cart.js | 4 ++--
 themes/bootstrap3/js/hold.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/bootstrap3/js/cart.js b/themes/bootstrap3/js/cart.js
index ba560f2bbd0..00425145f11 100644
--- a/themes/bootstrap3/js/cart.js
+++ b/themes/bootstrap3/js/cart.js
@@ -122,7 +122,7 @@ VuFind.register('cart', function Cart() {
   }
 
   var _cartNotificationTimeout = false;
-  function _registerUpdate($form) {
+  function _registerUpdate() {
     var $form = $('form[name="bulkActionForm"]');
     $("#updateCart, #bottom_updateCart").unbind('click').click(function cartUpdate() {
       var elId = this.id;
@@ -179,7 +179,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');
           }
         });
diff --git a/themes/bootstrap3/js/hold.js b/themes/bootstrap3/js/hold.js
index 155b900305c..9015f999709 100644
--- a/themes/bootstrap3/js/hold.js
+++ b/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);

From 3fb1d45e7343503c0b835645ae2628b519b30324 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Thu, 29 Sep 2016 13:46:03 -0400
Subject: [PATCH 13/21] formAttr parameter for bulk-action-buttons.

---
 .../templates/search/bulk-action-buttons.phtml       | 12 ++++++------
 themes/bootstrap3/templates/search/results.phtml     |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
index f5950621ff5..5078c3d14cd 100644
--- a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
+++ b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
@@ -3,23 +3,23 @@
   <div class="bulkActionButtons hidden-print<?if($this->idPrefix):?> form-inline<? endif; ?>">
     <div class="checkbox">
       <label>
-        <input type="checkbox" class="checkbox-select-all" name="selectAll" id="<?=$this->idPrefix?>addFormCheckboxSelectAll"<?if($this->idPrefix):?> form="search-cart-form"<? endif; ?>/> <?=$this->transEsc('select_page')?>
+        <input type="checkbox" class="checkbox-select-all" name="selectAll" id="<?=$this->idPrefix?>addFormCheckboxSelectAll"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<? endif; ?>/> <?=$this->transEsc('select_page')?>
         &#124; <?=$this->transEsc('with_selected')?>:
       </label>
     </div>
     <div class="btn-group">
       <? if (isset($this->showBulkOptions) && $this->showBulkOptions): ?>
-        <input id="ribbon-email" class="btn btn-default" type="submit" name="email" title="<?=$this->transEsc('bookbag_email_selected')?>" value="<?=$this->transEsc('Email')?>"<?if($this->idPrefix):?> form="search-cart-form"<? endif; ?>/>
+        <input id="ribbon-email" class="btn btn-default" type="submit" name="email" title="<?=$this->transEsc('bookbag_email_selected')?>" value="<?=$this->transEsc('Email')?>"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<? endif; ?>/>
         <? $exportOptions = $this->export()->getBulkOptions(); if (count($exportOptions) > 0): ?>
-          <input id="ribbon-export" class="btn btn-default" type="submit" name="export" title="<?=$this->transEsc('bookbag_export_selected')?>" value="<?=$this->transEsc('Export')?>"<?if($this->idPrefix):?> form="search-cart-form"<? endif; ?>/>
+          <input id="ribbon-export" class="btn btn-default" type="submit" name="export" title="<?=$this->transEsc('bookbag_export_selected')?>" value="<?=$this->transEsc('Export')?>"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<? endif; ?>/>
         <? endif; ?>
-        <input id="ribbon-print" class="btn btn-default" type="submit" name="print" title="<?=$this->transEsc('bookbag_print_selected')?>" value="<?=$this->transEsc('Print')?>"<?if($this->idPrefix):?> form="search-cart-form"<? endif; ?>/>
+        <input id="ribbon-print" class="btn btn-default" type="submit" name="print" title="<?=$this->transEsc('bookbag_print_selected')?>" value="<?=$this->transEsc('Print')?>"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<? endif; ?>/>
         <? if ($this->userlist()->getMode() !== 'disabled'): ?>
-          <input id="ribbon-save" class="btn btn-default" type="submit" name="saveCart" title="<?=$this->transEsc('bookbag_save_selected')?>" value="<?=$this->transEsc('Save')?>"<?if($this->idPrefix):?> form="search-cart-form"<? endif; ?>/>
+          <input id="ribbon-save" class="btn btn-default" type="submit" name="saveCart" title="<?=$this->transEsc('bookbag_save_selected')?>" value="<?=$this->transEsc('Save')?>"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<? endif; ?>/>
         <? endif; ?>
       <? endif; ?>
       <? if (isset($this->showCartControls) && $this->showCartControls): ?>
-        <input id="<?=$this->idPrefix?>updateCart" type="submit" class="btn btn-default" name="add" value="<?=$this->transEsc('Add to Book Bag')?>"<?if($this->idPrefix):?> form="search-cart-form"<? endif; ?>/>
+        <input id="<?=$this->idPrefix?>updateCart" type="submit" class="btn btn-default" name="add" value="<?=$this->transEsc('Add to Book Bag')?>"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<? endif; ?>/>
       <? endif; ?>
     </div>
   </div>
diff --git a/themes/bootstrap3/templates/search/results.phtml b/themes/bootstrap3/templates/search/results.phtml
index 5583dbf9843..f7323510c02 100644
--- a/themes/bootstrap3/templates/search/results.phtml
+++ b/themes/bootstrap3/templates/search/results.phtml
@@ -110,10 +110,10 @@
       <? endforeach; ?>
     <? else: ?>
       <form id="search-cart-form" class="form-inline" method="post" name="bulkActionForm" action="<?=$this->url('cart-searchresultsbulk')?>" data-lightbox data-lightbox-onsubmit="bulkFormHandler">
-        <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', array('idPrefix' => ''))?>
+        <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', array('idPrefix' => '', 'formAttr' => 'search-cart-form'))?>
       </form>
       <?=$this->render('search/list-' . $this->params->getView() . '.phtml')?>
-      <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', array('idPrefix' => 'bottom_'))?>
+      <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', array('idPrefix' => 'bottom_', 'formAttr' => 'search-cart-form'))?>
       <?=$this->paginationControl($this->results->getPaginator(), 'Sliding', 'search/pagination.phtml', array('results' => $this->results, 'options' => isset($this->paginationOptions) ? $this->paginationOptions : []))?>
 
       <div class="searchtools hidden-print">

From 4fb2cae08ecbde361fc166c3e6aa03ac314ee134 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Fri, 14 Oct 2016 15:24:02 -0400
Subject: [PATCH 14/21] Switch idPrefix to formAttr in one missed place.

---
 themes/bootstrap3/templates/search/bulk-action-buttons.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
index 5078c3d14cd..1bead238245 100644
--- a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
+++ b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
@@ -1,6 +1,6 @@
 <? if((isset($this->showBulkOptions)  && $this->showBulkOptions)
    || (isset($this->showCartControls) && $this->showCartControls)): ?>
-  <div class="bulkActionButtons hidden-print<?if($this->idPrefix):?> form-inline<? endif; ?>">
+  <div class="bulkActionButtons hidden-print<?if($this->formAttr):?> form-inline<? endif; ?>">
     <div class="checkbox">
       <label>
         <input type="checkbox" class="checkbox-select-all" name="selectAll" id="<?=$this->idPrefix?>addFormCheckboxSelectAll"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<? endif; ?>/> <?=$this->transEsc('select_page')?>

From 0088e6c5190bf5dc7f5a2be39ab8c81894a6ab9f Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Fri, 21 Oct 2016 17:17:22 -0400
Subject: [PATCH 15/21] Consolidate recaptcha resetting logic.

---
 themes/bootstrap3/js/common.js   | 12 ++++++++++--
 themes/bootstrap3/js/lightbox.js |  9 ++-------
 themes/bootstrap3/js/record.js   | 29 ++++++++++-------------------
 3 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/themes/bootstrap3/js/common.js b/themes/bootstrap3/js/common.js
index 18be48959fa..705a89e92ec 100644
--- a/themes/bootstrap3/js/common.js
+++ b/themes/bootstrap3/js/common.js
@@ -1,5 +1,5 @@
 /*global grecaptcha, isPhoneNumberValid */
-/*exported VuFind, htmlEncode, deparam, moreFacets, lessFacets, phoneNumberFormHandler, recaptchaOnLoad, bulkFormHandler */
+/*exported VuFind, htmlEncode, deparam, moreFacets, lessFacets, phoneNumberFormHandler, recaptchaOnLoad, resetCaptcha, bulkFormHandler */
 
 // IE 9< console polyfill
 window.console = window.console || {log: function polyfillLog() {}};
@@ -170,6 +170,14 @@ function recaptchaOnLoad() {
     }
   }
 }
+function resetCaptcha($form) {
+  if (typeof grecaptcha !== 'undefined') {
+    var captcha = $form.find('.g-recaptcha');
+    if (captcha.length > 0) {
+      grecaptcha.reset(captcha.data('captchaId'));
+    }
+  }
+}
 
 function bulkFormHandler(event, data) {
   if ($('.checkbox-select-item:checked,checkbox-select-all:checked').length === 0) {
@@ -377,7 +385,7 @@ $(document).ready(function commonDocReady() {
   }
 
   setupFacets();
-  
+
   // retain filter sessionStorage
   $('.searchFormKeepFilters').click(function retainFiltersInSessionStorage() {
     sessionStorage.setItem('vufind_retain_filters', this.checked ? 'true' : 'false');
diff --git a/themes/bootstrap3/js/lightbox.js b/themes/bootstrap3/js/lightbox.js
index 49e22aec8e1..4117cfb0d13 100644
--- a/themes/bootstrap3/js/lightbox.js
+++ b/themes/bootstrap3/js/lightbox.js
@@ -1,4 +1,4 @@
-/*global grecaptcha, recaptchaOnLoad, VuFind */
+/*global grecaptcha, recaptchaOnLoad, resetCaptcha, VuFind */
 VuFind.register('lightbox', function Lightbox() {
   // State
   var _originalUrl = false;
@@ -277,12 +277,7 @@ VuFind.register('lightbox', function Lightbox() {
       method: $(form).attr('method') || 'GET',
       data: data
     }).done(function recaptchaReset() {
-      if (typeof grecaptcha !== 'undefined') {
-        var captcha = $(form).find('.g-recaptcha');
-        if (captcha.length > 0) {
-          grecaptcha.reset(captcha.data('captchaId'));
-        }
-      }
+      resetCaptcha($(form));
     });
 
     VuFind.modal('show');
diff --git a/themes/bootstrap3/js/record.js b/themes/bootstrap3/js/record.js
index f71fb3b7b71..22844b6ffe9 100644
--- a/themes/bootstrap3/js/record.js
+++ b/themes/bootstrap3/js/record.js
@@ -1,4 +1,4 @@
-/*global deparam, grecaptcha, recaptchaOnLoad, syn_get_widget, userIsLoggedIn, VuFind */
+/*global deparam, grecaptcha, recaptchaOnLoad, resetCaptcha, syn_get_widget, userIsLoggedIn, VuFind */
 /*exported ajaxTagUpdate, recordDocReady */
 
 /**
@@ -78,12 +78,7 @@ function refreshCommentList($target, recordId, recordSource) {
       return false;
     });
     $target.find('.comment-form input[type="submit"]').button('reset');
-    if (typeof grecaptcha !== 'undefined') {
-      var captcha = $target.find('.g-recaptcha');
-      if (captcha.length > 0) {
-        grecaptcha.reset(captcha.data('captchaId'));
-      }
-    }
+    resetCaptcha($target);
   });
 }
 
@@ -112,19 +107,15 @@ function registerAjaxCommentRecord() {
       dataType: 'json'
     })
     .done(function addCommentDone(/*response, textStatus*/) {
-      var $tab = $(form).closest('.list-tab-content');
+      var $form = $(form);
+      var $tab = $form.closest('.list-tab-content');
       if (!$tab.length) {
-        $tab = $(form).closest('.tab-pane');
+        $tab = $form.closest('.tab-pane');
       }
       refreshCommentList($tab, id, recordSource);
-      $(form).find('textarea[name="comment"]').val('');
-      $(form).find('input[type="submit"]').button('loading');
-      if (typeof grecaptcha !== 'undefined') {
-        var captcha = $(form).find('.g-recaptcha');
-        if (captcha.length > 0) {
-          grecaptcha.reset(captcha.data('captchaId'));
-        }
-      }
+      $form.find('textarea[name="comment"]').val('');
+      $form.find('input[type="submit"]').button('loading');
+      resetCaptcha($form);
     })
     .fail(function addCommentFail(response, textStatus) {
       if (textStatus === 'abort' || typeof response.responseJSON === 'undefined') { return; }
@@ -275,9 +266,9 @@ function applyRecordTabHash() {
 function removeHashFromLocation() {
   if (window.history.replaceState) {
     var href = window.location.href.split('#');
-    window.history.replaceState({}, document.title, href[0]);  
+    window.history.replaceState({}, document.title, href[0]);
   } else {
-    window.location.hash = '#';  
+    window.location.hash = '#';
   }
 }
 

From fea6d6b2d8e6c5b444d87cc723e055e139f1329d Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Tue, 8 Nov 2016 12:01:05 -0500
Subject: [PATCH 16/21] Returning some flexibility to cart update button
 submission.

---
 themes/bootstrap3/js/cart.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/themes/bootstrap3/js/cart.js b/themes/bootstrap3/js/cart.js
index 0232c3fd81e..3d2474241b6 100644
--- a/themes/bootstrap3/js/cart.js
+++ b/themes/bootstrap3/js/cart.js
@@ -122,8 +122,10 @@ VuFind.register('cart', function Cart() {
   }
 
   var _cartNotificationTimeout = false;
-  function _registerUpdate() {
-    var $form = $('form[name="bulkActionForm"]');
+  function _registerUpdate(_form) {
+    var $form = typeof _form === 'undefined'
+      ? $('form[name="bulkActionForm"]')
+      : $(_form);
     $("#updateCart, #bottom_updateCart").unbind('click').click(function cartUpdate() {
       var elId = this.id;
       var selected = [];

From 9d8d7bf5f4794d28c8082f9897702b5c7609ddbd Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Tue, 8 Nov 2016 12:24:02 -0500
Subject: [PATCH 17/21] Move form-attr-polyfill to /lib

---
 themes/bootstrap3/js/{vendor => lib}/form-attr-polyfill.js | 0
 themes/bootstrap3/theme.config.php                         | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename themes/bootstrap3/js/{vendor => lib}/form-attr-polyfill.js (100%)

diff --git a/themes/bootstrap3/js/vendor/form-attr-polyfill.js b/themes/bootstrap3/js/lib/form-attr-polyfill.js
similarity index 100%
rename from themes/bootstrap3/js/vendor/form-attr-polyfill.js
rename to themes/bootstrap3/js/lib/form-attr-polyfill.js
diff --git a/themes/bootstrap3/theme.config.php b/themes/bootstrap3/theme.config.php
index ac9d3c42439..37804a60d1e 100644
--- a/themes/bootstrap3/theme.config.php
+++ b/themes/bootstrap3/theme.config.php
@@ -15,7 +15,7 @@
         'vendor/bootstrap.min.js',
         'vendor/bootstrap-accessibility.min.js',
         'vendor/validator.min.js',
-        'vendor/form-attr-polyfill.js', // input[form] polyfill, cannot load conditionally, since we need all versions of IE
+        'lib/form-attr-polyfill.js', // input[form] polyfill, cannot load conditionally, since we need all versions of IE
         'lib/autocomplete.js',
         'common.js',
         'lightbox.js',

From 649347afb4e7aad73bd32e07b08e33d51f53c4cd Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Tue, 13 Dec 2016 16:36:48 -0500
Subject: [PATCH 18/21] Improve form-attr-polyfill.js

- Remove previously added fields for multiple form submissions.
- Removed extraneous jQuery plugin appendFields.
- Faster in IE.
---
 .../bootstrap3/js/lib/form-attr-polyfill.js   | 46 ++++++++-----------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/themes/bootstrap3/js/lib/form-attr-polyfill.js b/themes/bootstrap3/js/lib/form-attr-polyfill.js
index 56dddadfc6a..000a63e44a5 100644
--- a/themes/bootstrap3/js/lib/form-attr-polyfill.js
+++ b/themes/bootstrap3/js/lib/form-attr-polyfill.js
@@ -14,33 +14,18 @@
     return;
   }
 
-  $(document).ready(function formAttrReady() {
-    /**
-     * Append a field to a form
-     *
-     */
-    $.fn.appendField = function appendField(_data) {
-      var data = (!$.isArray(_data) && _data.name && _data.value)
-        ? [_data] // wrap data
-        : _data;
-      // for form only
-      if (!this.is('form')) {
-        return;
-      }
-
-      var $form = this;
-
-      // attach new params
-      $.each(data, function appendFieldEach(i, item) {
-        $('<input/>')
-          .attr('type', 'hidden')
-          .attr('name', item.name)
-          .val(item.value).appendTo($form);
-      });
-
-      return $form;
-    };
+  function resetFormAttr(form) {
+    var $form = $(form);
+    $form.find('.js-form-attr').remove();
+    return $form;
+  }
+  function makeFieldElement(data) {
+    return $('<input/>', data)
+      .addClass('js-form-attr')
+      .attr('type', 'hidden');
+  }
 
+  $(document).ready(function formAttrReady() {
     /**
      * Find all input fields with form attribute point to jQuery object
      *
@@ -49,7 +34,11 @@
       // serialize data
       var data = $('[form=' + this.id + ']').serializeArray();
       // append data to form
-      $(this).appendField(data);
+      var $form = resetFormAttr(this);
+      for (var i=0; i<data.length; i++) {
+        $form.append(makeFieldElement(data[i]));
+      }
+      return true;
     }).each(function locateFormAttrEach() {
       var form = this,
         $fields = $('[form=' + this.id + ']');
@@ -69,7 +58,8 @@
             });
           });
         } else if (type.match(/^submit|image$/i)) {
-          $(form).appendField({name: this.name, value: this.value}).submit();
+          var $form = resetFormAttr(form);
+          $form.append( makeFieldElement({name: this.name, value: this.value}) ).submit();
         }
       });
     });

From e97311f6aa9de9b6254c4909a46c005bb7bfd3c6 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Tue, 13 Dec 2016 16:39:04 -0500
Subject: [PATCH 19/21] Remove unnecessary class.

---
 themes/bootstrap3/templates/search/bulk-action-buttons.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
index 1bead238245..9c3edeca19b 100644
--- a/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
+++ b/themes/bootstrap3/templates/search/bulk-action-buttons.phtml
@@ -1,6 +1,6 @@
 <? if((isset($this->showBulkOptions)  && $this->showBulkOptions)
    || (isset($this->showCartControls) && $this->showCartControls)): ?>
-  <div class="bulkActionButtons hidden-print<?if($this->formAttr):?> form-inline<? endif; ?>">
+  <div class="bulkActionButtons hidden-print">
     <div class="checkbox">
       <label>
         <input type="checkbox" class="checkbox-select-all" name="selectAll" id="<?=$this->idPrefix?>addFormCheckboxSelectAll"<?if($this->formAttr):?> form="<?=$this->escapeHtmlAttr($this->formAttr) ?>"<? endif; ?>/> <?=$this->transEsc('select_page')?>

From bc5be43c730136d4e43392a55a87001e4020eb01 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Tue, 13 Dec 2016 16:39:28 -0500
Subject: [PATCH 20/21] Pass in formAttr for bottom search bulk action form.

---
 themes/bootstrap3/templates/search/results.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/bootstrap3/templates/search/results.phtml b/themes/bootstrap3/templates/search/results.phtml
index b439e280e67..77e3a907557 100644
--- a/themes/bootstrap3/templates/search/results.phtml
+++ b/themes/bootstrap3/templates/search/results.phtml
@@ -113,7 +113,7 @@
         <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', ['idPrefix' => ''])?>
       </form>
       <?=$this->render('search/list-' . $this->params->getView() . '.phtml')?>
-      <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', ['idPrefix' => 'bottom_'])?>
+      <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', ['idPrefix' => 'bottom_', 'formAttr' => 'search-cart-form'])?>
       <?=$this->paginationControl($this->results->getPaginator(), 'Sliding', 'search/pagination.phtml', ['results' => $this->results, 'options' => isset($this->paginationOptions) ? $this->paginationOptions : []])?>
 
       <div class="searchtools hidden-print">

From 0fe706d98a6a2e67cad09fbd9a244869d7ceba7c Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Thu, 15 Dec 2016 15:30:07 -0500
Subject: [PATCH 21/21] Whitespace fix.

---
 themes/bootstrap3/js/common.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/bootstrap3/js/common.js b/themes/bootstrap3/js/common.js
index 6b08f5c6b42..fcd3fe6fb54 100644
--- a/themes/bootstrap3/js/common.js
+++ b/themes/bootstrap3/js/common.js
@@ -318,7 +318,7 @@ function setupFacets() {
           $(item).collapse('hide');
         }
       } finally {
-        $.support.transition = saveTransition;    
+        $.support.transition = saveTransition;
       }
     }
   });