Merge r7065, r7066 from the release 1.2 maintenance branch

This commit is contained in:
jeb228 2011-01-17 14:58:37 +00:00
parent adbdee50ed
commit 940fe03123
4 changed files with 49 additions and 42 deletions

View file

@ -2,12 +2,10 @@
$(document).ready(function(){
// Confirmation alert for photo deletion
$('a.thumbnail').click(function(){
// Confirmation alert for photo deletion in image upload and individual templates
$('#photoUploadDefaultImage a.thumbnail,#share-contact a:eq(2)').click(function(){
//$('#share-contact a [title="delete this relationship"]').click(function(){
var answer = confirm('Are you sure you want to delete your photo?');
return answer;
});
});
});