From 139d6947d2e82a5b3466ec0b1b4a29cd16a4b43d Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Thu, 23 Feb 2012 10:01:02 +0000
Subject: [PATCH] [-] BO : fix bug #PSTEST-841 - confirmation popup for product
 attribute deletion not working

---
 .../default/template/helpers/list/list_action_delete.tpl      | 2 +-
 js/admin-products.js                                          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl b/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl
index 86e3bb345..c05726f3c 100644
--- a/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl
@@ -23,6 +23,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a href="{$href}" class="delete" {if isset($confirm)}onclick="return confirm('{$confirm}');"{/if} title="{$action}">
+<a href="{$href}" class="delete" {if isset($confirm)}onclick="if (confirm('{$confirm}')){ return true; }else{ event.stopPropagation(); event.preventDefault();};"{/if} title="{$action}">
 	<img src="../img/admin/delete.gif" alt="{$action}" />
 </a>
\ No newline at end of file
diff --git a/js/admin-products.js b/js/admin-products.js
index 2a909f782..14ccad686 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -499,12 +499,12 @@ $(document).ready(function() {
 	// Bind to delete specific price link
 	onTabLoad('Prices', function(){
 		$('#specific_prices_list').delegate('a[name="delete_link"]', 'click', function(){
+			e.preventDefault();
 			deleteSpecificPrice(this.href, $(this).parents('tr'));
-			return false;
 		})
 	});
 
-	// Bind action edition on attribute list
+	// Bind attribute list ajax actions (edit, default, delete)
 	onTabLoad('Combinations', function(){
 		$('table[name=list_table]').delegate('a.edit', 'click', function(e){
 			e.preventDefault();