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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Kevin Granger committed 2013-06-17 19:19:28 +02:00
2 parents 993690801e c5069aaa15
commit 3bdf86e634
29 files changed
+141 -99
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

js/admin-products.js
+17 -13
View File
@@ -1356,23 +1356,27 @@ product_tabs['VirtualProduct'] = new function(){
// Bind file deletion
$(('#product-tab-content-VirtualProduct')).delegate('a.delete_virtual_product', 'click', function(e){
e.preventDefault();
if (!$('#virtual_product_id').val())
if (confirm(delete_this_file))
{
$('#upload_input').show();
$('#virtual_product_name').val('');
$('#virtual_product_file').val('');
$('#upload-confirmation').hide().find('span').remove();
}
else
{
var object = this;
ajaxAction(this.href, 'deleteVirtualProduct', function(){
$(object).closest('tr').remove();
if (!$('#virtual_product_id').val())
{
$('#upload_input').show();
$('#virtual_product_name').val('');
$('#virtual_product_file').val('');
$('#virtual_product_id').remove();
});
$('#upload-confirmation').hide().find('span').remove();
}
else
{
var object = this;
ajaxAction(this.href, 'deleteVirtualProduct', function(){
$(object).closest('tr').remove();
$('#upload_input').show();
$('#virtual_product_name').val('');
$('#virtual_product_file').val('');
$('#virtual_product_id').remove();
});
}
}
});
}