Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "Bucketize the thumbnail sizes requested better."

This commit is contained in:
Brad Fitzpatrick 2013-12-09 07:06:58 +00:00 committed by Gerrit Code Review
parent c2ee27a0f1 9aea2cda06
commit 06011342a0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/camlistored/ui/blob_item.js
View File

@ -212,9 +212,9 @@ camlistore.BlobItem.prototype.setSize = function(w, h) {
* @param {number} h
*/
camlistore.BlobItem.prototype.setThumbSize = function(w, h) {
// In the case of images, we don't want a full bleed to both w and h, so we
// clip the bigger dimension as necessary. It's not easy to notice that a few
// pixels have been shaved off the edge of a photo.
// In the case of images, we want a full bleed to both w and h, so we clip the
// bigger dimension as necessary. It's not easy to notice that a few pixels
// have been shaved off the edge of a photo.
//
// In the case of non-images, we have an icon with text underneath, so we
// cannot clip. Instead, just constrain the icon to fit the available space.
@ -242,7 +242,8 @@ camlistore.BlobItem.prototype.setThumbSize = function(w, h) {
adjustedHeight > this.thumb_.height) {
// Round the height up to the nearest 20% to increase the probability of
// cache hits.
var rh = Math.ceil(adjustedHeight / 5) * 5;
var fraction = Math.ceil(this.metaData_.thumbnailHeight * 0.2);
var rh = Math.ceil(adjustedHeight / fraction) * fraction;
// TODO(aa): This is kind of a hack, it would be better if the server just
// returned the base URL and the aspect ratio, rather than specific

3
server/camlistored/ui/blob_item_container.js
View File

@ -587,6 +587,9 @@ camlistore.BlobItemContainer.prototype.layout_ = function(force) {
continue;
}
// Decide how many items are going to be in this row. We choose the number
// that will result in the smallest adjustment to the image sizes having to
// be done.
var rowEnd, rowWidth;
if (i == lastItem) {
rowEnd = lastItem;