fix conflict

This commit is contained in:
Marion Muszynski 2016-11-30 12:59:56 +01:00
commit 1bde1c8550

View File

@ -377,7 +377,7 @@ function delAccessory(id)
input.value += inputCut[i] + '-';
name.value += nameCut[i] + '¤';
img.value += imgCut[i] + ';';
div.innerHTML += '<div class="item_accessory"><img src="/img/p/'+imgCut[i]+'-small.jpg" /> <p>'+nameCut[i] + ' <span onclick="delAccessory(' + inputCut[i] + ');" style="cursor: pointer;"><img src="../img/admin/delete.gif" /></span></p></div>';
div.innerHTML += '<div class="item_accessory"><img src="'+imgCut[i]+'" /> <p>'+nameCut[i] + ' <span onclick="delAccessory(' + inputCut[i] + ');" style="cursor: pointer;"><img src="../img/admin/delete.gif" /></span></p></div>';
}
else
$('#selectAccessories').append('<option selected="selected" value="' + inputCut[i] + '-' + nameCut[i] + '">' + inputCut[i] + ' - ' + nameCut[i] + '</option>');