dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : #PSCFV-3121 - New JS vars baseUri. This vars must be used instead of baseDir for ajax queries.

Browse Source
This commit is contained in:
mDeflotte
2012-07-11 08:48:28 +00:00
parent 34c3d62826
commit 74cc18e080
9 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/FrontController.php
+1
View File
@@ -315,6 +315,7 @@ class FrontControllerCore extends Controller
'base_dir' => _PS_BASE_URL_.__PS_BASE_URI__, 'base_dir' => _PS_BASE_URL_.__PS_BASE_URI__,
'base_dir_ssl' => $protocol_link.Tools::getShopDomainSsl().__PS_BASE_URI__, 'base_dir_ssl' => $protocol_link.Tools::getShopDomainSsl().__PS_BASE_URI__,
'content_dir' => $protocol_content.Tools::getHttpHost().__PS_BASE_URI__, 'content_dir' => $protocol_content.Tools::getHttpHost().__PS_BASE_URI__,
'base_uri' => $protocol_content.Tools::getHttpHost().__PS_BASE_URI__.(!Configuration::get('PS_REWRITING_SETTINGS') ? 'index.php' : ''),
'tpl_dir' => _PS_THEME_DIR_, 'tpl_dir' => _PS_THEME_DIR_,
'modules_dir' => _MODULE_DIR_, 'modules_dir' => _MODULE_DIR_,
'mail_dir' => _MAIL_DIR_, 'mail_dir' => _MAIL_DIR_,
modules/blockcart/ajax-cart.js
+6 -6
View File
@@ -122,7 +122,7 @@ var ajaxCart = {
//send the ajax request to the server //send the ajax request to the server
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: baseDir + 'index.php', url: baseUri,
async: true, async: true,
cache: false, cache: false,
dataType : "json", dataType : "json",
@@ -196,7 +196,7 @@ var ajaxCart = {
//send the ajax request to the server //send the ajax request to the server
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: baseDir + 'index.php', url: baseUri,
async: true, async: true,
cache: false, cache: false,
dataType : "json", dataType : "json",
@@ -253,7 +253,7 @@ var ajaxCart = {
//send the ajax request to the server //send the ajax request to the server
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: baseDir + 'index.php', url: baseUri,
async: true, async: true,
cache: false, cache: false,
dataType : "json", dataType : "json",
@@ -351,7 +351,7 @@ var ajaxCart = {
} }
var removeLinks = $('#cart_block_product_' + domIdProduct).find('a.ajax_cart_block_remove_link'); var removeLinks = $('#cart_block_product_' + domIdProduct).find('a.ajax_cart_block_remove_link');
if (!product.hasCustomizedDatas && !removeLinks.length) if (!product.hasCustomizedDatas && !removeLinks.length)
$('#' + domIdProduct + ' span.remove_link').html('<a class="ajax_cart_block_remove_link" rel="nofollow" href="' + baseDir + 'index.php?controller=cart&amp;delete&amp;id_product=' + product['id'] + '&amp;ipa=' + product['idCombination'] + '&amp;token=' + static_token + '"> </a>'); $('#' + domIdProduct + ' span.remove_link').html('<a class="ajax_cart_block_remove_link" rel="nofollow" href="' + baseUri + '?controller=cart&amp;delete&amp;id_product=' + product['id'] + '&amp;ipa=' + product['idCombination'] + '&amp;token=' + static_token + '"> </a>');
if (parseInt(product.price_float) <= 0) if (parseInt(product.price_float) <= 0)
$('#' + domIdProduct + ' span.remove_link').html(''); $('#' + domIdProduct + ' span.remove_link').html('');
}, },
@@ -445,7 +445,7 @@ var ajaxCart = {
content += '<a href="' + this.link + '" title="' + this.name + '">' + name + '</a>'; content += '<a href="' + this.link + '" title="' + this.name + '">' + name + '</a>';
if (parseFloat(this.price_float) > 0) if (parseFloat(this.price_float) > 0)
content += '<span class="remove_link"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseDir + 'index.php?controller=cart&amp;delete&amp;id_product=' + productId + '&amp;token=' + static_token + (this.hasAttributes ? '&amp;ipa=' + parseInt(this.idCombination) : '') + '"> </a></span>'; content += '<span class="remove_link"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseUri + '?controller=cart&amp;delete&amp;id_product=' + productId + '&amp;token=' + static_token + (this.hasAttributes ? '&amp;ipa=' + parseInt(this.idCombination) : '') + '"> </a></span>';
else else
content += '<span class="remove_link"></span>'; content += '<span class="remove_link"></span>';
@@ -524,7 +524,7 @@ var ajaxCart = {
// If the customization is already displayed on the cart, no update's needed // If the customization is already displayed on the cart, no update's needed
if ($("#deleteCustomizableProduct_" + customizationId + "_" + productId + "_" + productAttributeId).length) if ($("#deleteCustomizableProduct_" + customizationId + "_" + productId + "_" + productAttributeId).length)
return (''); return ('');
content += '<li name="customization"><div class="deleteCustomizableProduct" id="deleteCustomizableProduct_' + customizationId + '_' + productId + '_' + (productAttributeId ? productAttributeId : '0') + '"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseDir + 'index.php?controller=cart&amp;delete&amp;id_product=' + productId + '&amp;ipa=' + productAttributeId + '&amp;id_customization=' + customizationId + '&amp;token=' + static_token + '"> </a></div><span class="quantity-formated"><span class="quantity">' + parseInt(this.quantity) + '</span>x</span>'; content += '<li name="customization"><div class="deleteCustomizableProduct" id="deleteCustomizableProduct_' + customizationId + '_' + productId + '_' + (productAttributeId ? productAttributeId : '0') + '"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseUri + '?controller=cart&amp;delete&amp;id_product=' + productId + '&amp;ipa=' + productAttributeId + '&amp;id_customization=' + customizationId + '&amp;token=' + static_token + '"> </a></div><span class="quantity-formated"><span class="quantity">' + parseInt(this.quantity) + '</span>x</span>';
// Give to the customized product the first textfield value as name // Give to the customized product the first textfield value as name
$(this.datas).each(function(){ $(this.datas).each(function(){
modules/blockwishlist/js/ajax-wishlist.js
+1 -1
View File
@@ -102,7 +102,7 @@ function WishlistBuyProduct(token, id_product, id_product_attribute, id_quantity
$('#' + id_quantity).val(0); $('#' + id_quantity).val(0);
WishlistAddProductCart(token, id_product, id_product_attribute, id_quantity) WishlistAddProductCart(token, id_product, id_product_attribute, id_quantity)
document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].method='POST'; document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].method='POST';
document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].action=baseDir + 'cart.php'; document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].action=baseUri + '?controller=cart';
document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].elements['token'].value = static_token; document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].elements['token'].value = static_token;
document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].submit(); document.forms['addtocart' + '_' + id_product + '_' + id_product_attribute].submit();
} }
themes/default/authentication.tpl
+1 -1
View File
@@ -96,7 +96,7 @@ $(function(){ldelim}
//send the ajax request to the server //send the ajax request to the server
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: baseDir + 'index.php', url: baseUri,
async: true, async: true,
cache: false, cache: false,
dataType : "json", dataType : "json",
themes/default/header.tpl
+1
View File
@@ -42,6 +42,7 @@
<link rel="shortcut icon" type="image/x-icon" href="{$favicon_url}?{$img_update_time}" /> <link rel="shortcut icon" type="image/x-icon" href="{$favicon_url}?{$img_update_time}" />
<script type="text/javascript"> <script type="text/javascript">
var baseDir = '{$content_dir}'; var baseDir = '{$content_dir}';
var baseUri = '{$base_uri}';
var static_token = '{$static_token}'; var static_token = '{$static_token}';
var token = '{$token}'; var token = '{$token}';
var priceDisplayPrecision = {$priceDisplayPrecision*$currency->decimals}; var priceDisplayPrecision = {$priceDisplayPrecision*$currency->decimals};
themes/default/js/cart-summary.js
+6 -6
View File
@@ -87,7 +87,7 @@ function changeAddressDelivery(obj)
{ {
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: baseDir, url: baseUri,
async: true, async: true,
cache: false, cache: false,
dataType: 'json', dataType: 'json',
@@ -159,7 +159,7 @@ function changeAddressDelivery(obj)
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: baseDir, url: baseUri,
async: true, async: true,
cache: false, cache: false,
dataType: 'json', dataType: 'json',
@@ -269,7 +269,7 @@ function deleteProductFromSummary(id)
id_address_delivery = parseInt(ids[3]); id_address_delivery = parseInt(ids[3]);
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: baseDir, url: baseUri,
async: true, async: true,
cache: false, cache: false,
dataType: 'json', dataType: 'json',
@@ -392,7 +392,7 @@ function upQuantity(id, qty)
id_address_delivery = parseInt(ids[3]); id_address_delivery = parseInt(ids[3]);
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: baseDir, url: baseUri,
async: true, async: true,
cache: false, cache: false,
dataType: 'json', dataType: 'json',
@@ -470,7 +470,7 @@ function downQuantity(id, qty)
{ {
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: baseDir, url: baseUri,
async: true, async: true,
cache: false, cache: false,
dataType: 'json', dataType: 'json',
@@ -757,7 +757,7 @@ $(document).ready(function() {
$('#allow_seperated_package').live('click', function() { $('#allow_seperated_package').live('click', function() {
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: baseDir, url: baseUri,
async: true, async: true,
cache: false, cache: false,
data: 'controller=cart&ajax=true&allowSeperatedPackage&value=' data: 'controller=cart&ajax=true&allowSeperatedPackage&value='
themes/default/js/history.js
+1 -1
View File
@@ -108,7 +108,7 @@ function sendOrderMessage ()
}); });
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: baseDir + "index.php?controller=order-detail", url: baseUri + "index.php?controller=order-detail",
data: paramString, data: paramString,
success: function (msg){ success: function (msg){
$('#block-order-detail').fadeOut('slow', function() { $('#block-order-detail').fadeOut('slow', function() {
themes/default/js/order-address.js
+1 -1
View File
@@ -103,7 +103,7 @@ function updateAddresses()
var idAddress_invoice = $('input[type=checkbox]#addressesAreEquals:checked').length == 1 ? idAddress_delivery : $('#id_address_invoice').val(); var idAddress_invoice = $('input[type=checkbox]#addressesAreEquals:checked').length == 1 ? idAddress_delivery : $('#id_address_invoice').val();
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: baseDir, url: baseUri,
async: true, async: true,
cache: false, cache: false,
dataType : "json", dataType : "json",
themes/default/js/stores.js
+1 -1
View File
@@ -89,7 +89,7 @@ function clearLocations(n)
function searchLocationsNear(center) function searchLocationsNear(center)
{ {
var radius = document.getElementById('radiusSelect').value; var radius = document.getElementById('radiusSelect').value;
var searchUrl = baseDir+'stores.php?ajax=1&latitude=' + center.lat() + '&longitude=' + center.lng() + '&radius=' + radius; var searchUrl = baseUri+'?controller=stores&ajax=1&latitude=' + center.lat() + '&longitude=' + center.lng() + '&radius=' + radius;
downloadUrl(searchUrl, function(data) { downloadUrl(searchUrl, function(data) {
var xml = parseXml(data); var xml = parseXml(data);
var markerNodes = xml.documentElement.getElementsByTagName('marker'); var markerNodes = xml.documentElement.getElementsByTagName('marker');