|
|
@ -1171,13 +1171,15 @@ angular.module('myApp.services', []) |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
console.log('choosing', photo, width, height, bestPhotoSize); |
|
|
|
|
|
|
|
|
|
|
|
return bestPhotoSize; |
|
|
|
return bestPhotoSize; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
function wrapForHistory (photoID) { |
|
|
|
function wrapForHistory (photoID) { |
|
|
|
var photo = angular.copy(photos[photoID]) || {_: 'photoEmpty'}, |
|
|
|
var photo = angular.copy(photos[photoID]) || {_: 'photoEmpty'}, |
|
|
|
width = 100, |
|
|
|
width = 260, |
|
|
|
height = 100, |
|
|
|
height = 260, |
|
|
|
thumbPhotoSize = choosePhotoSize(photo, width, height), |
|
|
|
thumbPhotoSize = choosePhotoSize(photo, width, height), |
|
|
|
thumb = { |
|
|
|
thumb = { |
|
|
|
placeholder: 'img/placeholders/PhotoThumbConversation.gif', |
|
|
|
placeholder: 'img/placeholders/PhotoThumbConversation.gif', |
|
|
@ -1195,6 +1197,9 @@ angular.module('myApp.services', []) |
|
|
|
|
|
|
|
|
|
|
|
thumb.location = thumbPhotoSize.location; |
|
|
|
thumb.location = thumbPhotoSize.location; |
|
|
|
thumb.size = thumbPhotoSize.size; |
|
|
|
thumb.size = thumbPhotoSize.size; |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
thumb.width = 100; |
|
|
|
|
|
|
|
thumb.height = 100; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
photo.thumb = thumb; |
|
|
|
photo.thumb = thumb; |
|
|
|