Skip to content

fix data-context-url logic #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix data-context-url logic #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 26 additions & 30 deletions src/bda/plone/cart/browser/cart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,7 @@
(function($, bdajax) {
"use strict";

var CART_EXECUTION_CONTEXT = null,
CART_EXECUTION_URL = null,
CART_PORTLET_IDENTIFYER = '#portlet-cart',
CART_VIEWLET_IDENTIFYER = '#cart_viewlet';

$(document).ready(function() {
var execution_context = $('.cart_execution_context');
if (execution_context.length) {
CART_EXECUTION_CONTEXT = execution_context.text();
}
var execution_url = $('#cart');
if (execution_url.length) {
CART_EXECUTION_URL = execution_url.data('context-url');
}
cart.init();
cart.query();
if (window.Faceted !== undefined) {
Expand Down Expand Up @@ -53,7 +40,16 @@
}

Cart.prototype.init = function() {
this.cart_node = $('#cart').get(0);
var $cart = $('#cart');

this.cart_execution_context = $('.cart_execution_context').text() || null;

var cart_execution_url = $cart.data('context-url');
this.cart_execution_url = cart_execution_url ? cart_execution_url + '/' : '';
this.cart_portlet_identifier = '#portlet-cart';
this.cart_viewlet_identifier = '#cart_viewlet';

this.cart_node = $cart.get(0);
if (!this.cart_node) {
return;
}
Expand Down Expand Up @@ -124,19 +120,19 @@
this.cart_max_article_count = data.cart_settings.cart_max_article_count;
if (data.cart_items.length === 0) {
if (!data.cart_settings.hide_cart_if_empty) {
$(CART_PORTLET_IDENTIFYER).css('display', 'block');
$(CART_VIEWLET_IDENTIFYER).css('display', 'block');
$(this.cart_portlet_identifier).css('display', 'block');
$(this.cart_viewlet_identifier).css('display', 'block');
} else {
$(CART_PORTLET_IDENTIFYER).css('display', 'none');
$(CART_VIEWLET_IDENTIFYER).css('display', 'none');
$(this.cart_portlet_identifier).css('display', 'none');
$(this.cart_viewlet_identifier).css('display', 'none');
}
$('#cart_items', this.cart_node).css('display', 'none');
$('#cart_no_items', this.cart_node).css('display', 'block');
$('#cart_summary', this.cart_node).css('display', 'none');
$('.cart_total_count').html(0);
} else {
$(CART_PORTLET_IDENTIFYER).css('display', 'block');
$(CART_VIEWLET_IDENTIFYER).css('display', 'block');
$(this.cart_portlet_identifier).css('display', 'block');
$(this.cart_viewlet_identifier).css('display', 'block');
$('#cart_no_items', this.cart_node).css('display', 'none');
$('#cart_items', this.cart_node).empty();
$('#cart_items', this.cart_node).css('display', 'block');
Expand Down Expand Up @@ -295,13 +291,13 @@
uid: defs[0],
count: count + ''
};
if (CART_EXECUTION_CONTEXT) {
params.execution_context = CART_EXECUTION_CONTEXT;
if (this.cart_execution_context) {
params.execution_context = this.cart_execution_context;
}
var elem = $(this);
var status_message = elem.hasClass('show_status_message');
bdajax.request({
url: CART_EXECUTION_URL + '/validate_cart_item',
url: this.cart_execution_url + 'validate_cart_item',
params: params,
type: 'json',
success: function(data) {
Expand Down Expand Up @@ -357,13 +353,13 @@
uid: defs[0],
count: count + ''
};
if (CART_EXECUTION_CONTEXT) {
params.execution_context = CART_EXECUTION_CONTEXT;
if (this.cart_execution_context) {
params.execution_context = this.cart_execution_context;
}
var elem = $(this);
var status_message = elem.hasClass('show_status_message');
bdajax.request({
url: CART_EXECUTION_URL + '/validate_cart_item',
url: this.cart_execution_url + 'validate_cart_item',
params: params,
type: 'json',
success: function(data) {
Expand Down Expand Up @@ -560,11 +556,11 @@
return;
}
var params = {};
if (CART_EXECUTION_CONTEXT) {
params.execution_context = CART_EXECUTION_CONTEXT;
if (this.cart_execution_context) {
params.execution_context = this.cart_execution_context;
}
bdajax.request({
url: CART_EXECUTION_URL + '/cartData',
url: this.cart_execution_url + 'cartData',
params: params,
type: 'json',
success: function(data) {
Expand All @@ -577,4 +573,4 @@
var cart = new Cart();
window.bda_plone_cart = cart;

})(jQuery, bdajax);
})(jQuery, bdajax);