Skip to content
This repository was archived by the owner on Aug 30, 2018. It is now read-only.

Pre release2 #3

Merged
cshold merged 3 commits into from
Mar 6, 2014
Merged

Pre release2 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16c2705
Minor cleanup of unused classes/styles
cshold Mar 6, 2014
06c2eaf
Lame timeout to deal with image sizes in cart. Need a fix for this
cshold Mar 6, 2014
c1ff05e
Renamed ajaxify classes to use dashes instead of underscores.
cshold Mar 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions assets/ajaxify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,9 +361,9 @@ var ajaxifyShopify = (function(module, $) {
$addToCart.addClass('flip-front').wrap('<div class="flip"></div>');

// Write a (hidden) Checkout button, a loader, and the extra view cart button
var checkoutBtn = $('<a href="/checkout" class="flip-back" style="background-color: #C00; color: #fff;" id="flip__checkout">Checkout</a>').addClass($btnClass),
flipLoader = $('<span class="ajaxifyCart__loader"></span>'),
flipExtra = $('<div class="flip__extra">or <a href="#" class="flip__cart">View Cart (<span></span>)</a></div>');
var checkoutBtn = $('<a href="/checkout" class="flip-back" style="background-color: #C00; color: #fff;" id="flip-checkout">Checkout</a>').addClass($btnClass),
flipLoader = $('<span class="ajaxifyCart-loader"></span>'),
flipExtra = $('<div class="flip-extra">or <a href="#" class="flip-cart">View Cart (<span></span>)</a></div>');

// Append checkout button and loader
checkoutBtn.insertAfter($addToCart);
Expand All @@ -378,7 +378,7 @@ var ajaxifyShopify = (function(module, $) {

// Setup extra selectors once appended
flipExtra.insertAfter($flipContainer);
$flipCart = $('.flip__cart');
$flipCart = $('.flip-cart');

$flipCart.on('click', function(e) {
e.preventDefault();
Expand Down Expand Up @@ -561,7 +561,7 @@ var ajaxifyShopify = (function(module, $) {

switch (settings.method) {
case 'flip':
$('.flip__cart span').html(cart.item_count);
$('.flip-cart span').html(cart.item_count);
break;
case 'modal':
buildCart(cart);
Expand Down Expand Up @@ -684,7 +684,7 @@ var ajaxifyShopify = (function(module, $) {

// Link up close modal link
if (settings.method == 'modal') {
$closeCart = $('.ajaxifyCart__close');
$closeCart = $('.ajaxifyCart--close');
$closeCart.off( 'click', hideModal );
$closeCart.on( 'click', hideModal );
}
Expand Down Expand Up @@ -723,10 +723,11 @@ var ajaxifyShopify = (function(module, $) {
if (cart.item_count > 0) {
sizeDrawer();

// Since your /cart template might use larger images, resize again
// Since your /cart template might use larger images, resize again.
// ** Will work on a better solution to image loading here soon. **
setTimeout(function() {
sizeDrawer();
}, 500);
}, 1000);
} else {
sizeDrawer(true);
}
Expand All @@ -749,18 +750,18 @@ var ajaxifyShopify = (function(module, $) {
}

// Update quantify selectors
var qtyAdjust = $('.ajaxifyCart__qty span');
var qtyAdjust = $('.ajaxifyCart--qty span');

// Add or remove from the quantity
qtyAdjust.off('click');
qtyAdjust.on('click', function() {
var el = $(this),
id = el.data('id'),
qtySelector = el.siblings('.ajaxifyCart__num'),
qtySelector = el.siblings('.ajaxifyCart--num'),
qty = parseInt( qtySelector.val() );

// Add or subtract from the current quantity
if (el.hasClass('ajaxifyCart__add')) {
if (el.hasClass('ajaxifyCart--add')) {
qty = qty + 1;
} else {
qty = qty - 1;
Expand All @@ -778,7 +779,7 @@ var ajaxifyShopify = (function(module, $) {
});

// Update quantity based on input on change
var qtyInput = $('.ajaxifyCart__num');
var qtyInput = $('.ajaxifyCart--num');
qtyInput.off('change');
qtyInput.on('change', function() {
var el = $(this),
Expand Down Expand Up @@ -810,7 +811,7 @@ var ajaxifyShopify = (function(module, $) {
});

// Completely remove product
$('.ajaxifyCart__remove').on('click', function(e) {
$('.ajaxifyCart--remove').on('click', function(e) {
var el = $(this),
id = el.data('id') || null,
qty = 0;
Expand All @@ -827,10 +828,12 @@ var ajaxifyShopify = (function(module, $) {
function updateQuantity(id, qty) {
// This function only adds activity classes if using the default handlebar.js templates.
// The item quantity will be updated normally if using the /cart template.
var row = $('.ajaxifyCart__row[data-id="' + id + '"]').parent().addClass('ajaxifyCart--is-loading');
if (!settings.useCartTemplate) {
var row = $('.ajaxifyCart--row[data-id="' + id + '"]').parent().addClass('ajaxifyCart--is-loading');

if ( qty == 0 ) {
row.addClass('is-removed');
if ( qty == 0 ) {
row.addClass('is-removed');
}
}

// Slight delay to make sure removed animation is done
Expand Down Expand Up @@ -902,7 +905,7 @@ var ajaxifyShopify = (function(module, $) {
// If there is a regular link to remove an item, add attributes needed to ajaxify it
if ($('a[href^="/cart/change"]', $cartContainer).length) {
$('a[href^="/cart/change"]', $cartContainer).each(function() {
var el = $(this).addClass('ajaxifyCart__remove');
var el = $(this).addClass('ajaxifyCart--remove');
});
}
},
Expand Down
Loading