diff --git a/templates/client/blank.html b/templates/client/blank.html index 6d3514b9..2a28c17f 100644 --- a/templates/client/blank.html +++ b/templates/client/blank.html @@ -231,15 +231,11 @@ This template include basic anf main styles and js files, diff --git a/templates/client/static_client/js/rejs/banners.js b/templates/client/static_client/js/rejs/banners.js index fc266152..70e4998b 100644 --- a/templates/client/static_client/js/rejs/banners.js +++ b/templates/client/static_client/js/rejs/banners.js @@ -4,18 +4,22 @@ var API_URL_ROOT = "/expo-b/get-banners/"; var getUrl = function () { - var catalog = ""; + var search = []; var parts = /^\/([^\/]+)(?:\/|$)/i.exec(location.pathname); if (parts) { - catalog = parts[1]; + search.push("catalog=" + encodeURIComponent(parts[1])); + } else { + search.push("catalog="); } - var data = window.sendData; + var elements = $("[id^=\"expo_b_\"]"); + for (var j = 0; j < elements.length; j++) { + search.push("places=" + encodeURIComponent($(elements[j]).attr("id"))); + } + var data = window.sendData; if (data instanceof Object) { - var search = ["catalog=" + catalog]; - for (var key in data) { if (data.hasOwnProperty(key)) { var value = data[key]; @@ -29,11 +33,9 @@ } } } - - return API_URL_ROOT + "?" + search.join("&"); } - return API_URL_ROOT; + return API_URL_ROOT + "?" + search.join("&"); }; var getBanners = function (url, callback) { diff --git a/templates/client/static_client/js/rejs/tops.js b/templates/client/static_client/js/rejs/tops.js index db87aa6a..31bee27b 100644 --- a/templates/client/static_client/js/rejs/tops.js +++ b/templates/client/static_client/js/rejs/tops.js @@ -5,18 +5,17 @@ var PARENT_ID = "expo_top_events"; var getUrl = function () { - var catalog = ""; + var search = []; var parts = /^\/([^\/]+)(?:\/|$)/i.exec(location.pathname); if (parts) { - catalog = parts[1]; + search.push("catalog=" + encodeURIComponent(parts[1])); + } else { + search.push("catalog="); } var data = window.sendData; - if (data instanceof Object) { - var search = ["catalog=" + catalog]; - for (var key in data) { if (data.hasOwnProperty(key)) { var value = data[key]; @@ -30,11 +29,9 @@ } } } - - return API_URL_ROOT + "?" + search.join("&"); } - return API_URL_ROOT; + return API_URL_ROOT + "?" + search.join("&"); }; var getTops = function (url, callback) {