diff --git a/themes/bootstrap3/js/cart.js b/themes/bootstrap3/js/cart.js index c18c4d7063217ad047730dbe8e18f9af3be77268..87f40f8f513366a23997ee5f31a6da0d2f2e81ed 100644 --- a/themes/bootstrap3/js/cart.js +++ b/themes/bootstrap3/js/cart.js @@ -208,25 +208,6 @@ $(document).ready(function() { }); Lightbox.confirm(vufindString['bulk_save_success']); }); - Lightbox.addFormHandler('exportForm', function(evt) { - $.ajax({ - url: path + '/AJAX/JSON?' + $.param({method:'exportFavorites'}), - type:'POST', - dataType:'json', - data:Lightbox.getFormData($(evt.target)), - success:function(data) { - if(data.data.needs_redirect) { - document.location.href = data.data.result_url; - } else { - Lightbox.changeContent(data.data.result_additional); - } - }, - error:function(d,e) { - //console.log(d,e); // Error reporting - } - }); - return false; - }); $('#modal').on('hidden.bs.modal', function() { // Update cart items (add to cart, remove from cart, cart lightbox interface) var cartCount = $('#cartItems strong'); diff --git a/themes/bootstrap3/js/common.js b/themes/bootstrap3/js/common.js index 0bd83c3b4a1b9b2a7ba0f8d8b157055aa00b8727..86785ed26171482f89a02cd87ca50033e78f2547 100644 --- a/themes/bootstrap3/js/common.js +++ b/themes/bootstrap3/js/common.js @@ -394,26 +394,43 @@ $(document).ready(function() { * LIGHTBOX DEFAULT BEHAVIOUR * ******************************/ Lightbox.addOpenAction(registerLightboxEvents); + Lightbox.addFormCallback('newList', Lightbox.changeContent); - Lightbox.addFormHandler('loginForm', function(evt) { - ajaxLogin(evt.target); - return false; - }); Lightbox.addFormCallback('accountForm', newAccountHandler); - Lightbox.addFormCallback('emailSearch', function(html) { - Lightbox.confirm(vufindString['bulk_email_success']); + Lightbox.addFormCallback('bulkDelete', function(html) { + location.reload(); }); - Lightbox.addFormCallback('saveRecord', function(html) { + Lightbox.addFormCallback('bulkRecord', function(html) { Lightbox.close(); checkSaveStatuses(); }); - Lightbox.addFormCallback('bulkDelete', function(html) { - location.reload(); + Lightbox.addFormCallback('emailSearch', function(html) { + Lightbox.confirm(vufindString['bulk_email_success']); }); - Lightbox.addFormCallback('bulkRecord', function(html) { + Lightbox.addFormCallback('saveRecord', function(html) { Lightbox.close(); checkSaveStatuses(); }); + + Lightbox.addFormHandler('exportForm', function(evt) { + $.ajax({ + url: path + '/AJAX/JSON?' + $.param({method:'exportFavorites'}), + type:'POST', + dataType:'json', + data:Lightbox.getFormData($(evt.target)), + success:function(data) { + if(data.data.needs_redirect) { + document.location.href = data.data.result_url; + } else { + Lightbox.changeContent(data.data.result_additional); + } + }, + error:function(d,e) { + //console.log(d,e); // Error reporting + } + }); + return false; + }); Lightbox.addFormHandler('feedback', function(evt) { var $form = $(evt.target); // Grabs hidden inputs @@ -433,6 +450,10 @@ $(document).ready(function() { } return false; }); + Lightbox.addFormHandler('loginForm', function(evt) { + ajaxLogin(evt.target); + return false; + }); // Feedback $('#feedbackLink').click(function() {