diff --git a/themes/bootstrap/js/cart.js b/themes/bootstrap/js/cart.js index 3308a86adcb0f7c72aec42d2e1c87e21fddfb361..f73c7924bb7f576d846e4595f38972da3546b409 100644 --- a/themes/bootstrap/js/cart.js +++ b/themes/bootstrap/js/cart.js @@ -52,6 +52,15 @@ function addItemToCart(id,source) { $('#cartItems strong').html(parseInt($('#cartItems strong').html(), 10)+1); return true; } +function uniqueArray(op) { + var ret = []; + for(var i=0;i<op.length;i++) { + if(ret.indexOf(op[i]) < 0) { + ret.push(op[i]); + } + } + return ret; +} function removeItemFromCart(id,source) { var cartItems = getCartItems(); var cartSources = getCartSources(); @@ -95,16 +104,6 @@ function removeItemFromCart(id,source) { } return false; } -function uniqueArray(op) { - var ret = []; - for(var i=0;i<op.length;i++) { - if(ret.indexOf(op[i]) < 0) { - ret.push(op[i]); - } - } - return ret; -} - function registerUpdateCart($form) { if($form) { $("#updateCart, #bottom_updateCart").unbind('click').click(function(){ @@ -213,12 +212,12 @@ $(document).ready(function() { url: path + '/AJAX/JSON?' + $.param({method:'exportFavorites'}), type:'POST', dataType:'json', - data:getDataFromForm($(evt.target)), + data:Lightbox.getFormData($(evt.target)), success:function(data) { if(data.data.needs_redirect) { document.location.href = data.data.result_url; } else { - changeModalContent(data.data.result_additional); + Lightbox.changeContent(data.data.result_additional); } }, error:function(d,e) { diff --git a/themes/bootstrap/js/common.js b/themes/bootstrap/js/common.js index 10ff91ffdf88b9652c0adb9717a49b1aac682630..8c4eebfdaaffff382e9c899b101b8a4c853f5e2c 100644 --- a/themes/bootstrap/js/common.js +++ b/themes/bootstrap/js/common.js @@ -1,4 +1,4 @@ -/*global path, vufindString */ +/*global Lightbox, path, vufindString */ /* --- GLOBAL FUNCTIONS --- */ function htmlEncode(value){ @@ -182,7 +182,7 @@ $(document).ready(function() { var parts = this.href.split('/'); return Lightbox.get(parts[parts.length-3],'Save',{id:$(this).attr('id')}); }); - Lightbox.addFormCallback('emailSearch', function(html) { + Lightbox.addFormCallback('emailSearch', function(x) { Lightbox.confirm(vufindString['bulk_email_success']); }); }); \ No newline at end of file diff --git a/themes/bootstrap/js/lightbox.js b/themes/bootstrap/js/lightbox.js index 80fc65ee094460c6b3ddd0fd1614d885a9c515b4..dc1f5fa87d0653bd18aadacd72822702f56c9b02 100644 --- a/themes/bootstrap/js/lightbox.js +++ b/themes/bootstrap/js/lightbox.js @@ -52,7 +52,7 @@ var Lightbox = { if(typeof expectsError === "undefined" || expectsError) { this.formCallbacks[formName] = function(html) { Lightbox.checkForError(html, func); - } + }; } else { this.formCallbacks[formName] = func; } @@ -383,13 +383,13 @@ var Lightbox = { } else { $(form).unbind('submit').submit(function(evt){ Lightbox.submit($(evt.target), function(html){ - Lightbox.checkForError(html, Lightbox.close) + Lightbox.checkForError(html, Lightbox.close); }); return false; }); } - }, -} + } +}; /** * This is a full handler for the login form @@ -491,7 +491,7 @@ function ajaxLogin(form) { } } }); -}; +} /** * This is where you add click events to open the lightbox. diff --git a/themes/bootstrap/js/record.js b/themes/bootstrap/js/record.js index 3d3c66906b1720a973df8f98641023d4f7868b5a..63cf817db7247bfa26ef68a47bbe672e296acd51 100644 --- a/themes/bootstrap/js/record.js +++ b/themes/bootstrap/js/record.js @@ -1,4 +1,4 @@ -/*global extractClassParams, Lightbox, path, vufindString */ +/*global deparam, extractClassParams, htmlEncode, Lightbox, path, vufindString */ /** * Functions and event handlers specific to record pages.