From: Benoît Pin Date: Sun, 3 Aug 2014 14:14:24 +0000 (+0200) Subject: shrink -> adjust. X-Git-Url: https://scm.cri.ensmp.fr/git/Portfolio.git/commitdiff_plain/ec68e561dc6dcad7517bae68ddd8aed2c8440394?hp=dc502e53f9f6081d3c2bc4e9991feffcd60c15e1 shrink -> adjust. --- diff --git a/skins/photo_film_viewer.js b/skins/photo_film_viewer.js index 16ffb88..c6f583b 100644 --- a/skins/photo_film_viewer.js +++ b/skins/photo_film_viewer.js @@ -5,7 +5,6 @@ Licence Creative Commons http://creativecommons.org/licenses/by-nc/2.0/ */ var FilmSlider; -var s; (function(){ var keyLeft = 37, keyRight = 39; @@ -16,7 +15,6 @@ var DEFAULT_IMAGE_SIZES = [500, 600, 800]; FilmSlider = function(filmBar, slider, ctxInfos, image, toolbar, breadcrumbs) { var thisSlider = this; - s = this; this.filmBar = filmBar; this.filmBarWidth = getObjectWidth(this.filmBar); var film = filmBar.firstChild; @@ -187,7 +185,7 @@ FilmSlider.prototype._fitToScreen = function(evt) { var src = this.image.src.replace(imgRequestedSize, 'size=' + bestFitSize); this.pendingImage.src = src; } - this.shrinkImage(this.image); + this.adjustImage(this.image); }; FilmSlider.prototype.getBestFitSize = function(ratio) { @@ -212,11 +210,11 @@ FilmSlider.prototype.getBestFitSize = function(ratio) { return DEFAULT_IMAGE_SIZES[i]; }; -FilmSlider.prototype.shrinkImage = function(img) { +FilmSlider.prototype.adjustImage = function(img) { var dispWidth = parseInt(this.stretchable.style.width); - var imgWidth = img.width; + var imgWidth = img.naturalWidth; var dispHeight = parseInt(this.stretchable.style.height); - var imgHeight = img.height; + var imgHeight = img.naturalHeight; var ratio; if (imgHeight > dispHeight) { @@ -744,27 +742,11 @@ FilmSlider.prototype.populateViewer = function(req) { }; FilmSlider.prototype.refreshImage = function() { - var dispWidth = getObjectWidth(this.stretchable); - var imgWidth = this.pendingImage.width; - var dispHeight = getObjectHeight(this.stretchable); - var imgHeight = this.pendingImage.height; - var ratio; - - if (imgHeight > dispHeight) { - ratio = dispHeight / imgHeight; - imgWidth = imgWidth * ratio; - imgHeight = dispHeight; - } - if (imgWidth > dispWidth) { - ratio = dispWidth / imgWidth; - imgHeight = imgHeight * ratio; - imgWidth = dispWidth; - } - + this.adjustImage(this.pendingImage); this.image.style.visibility = 'hidden'; this.image.src = this.pendingImage.src; - this.image.width = imgWidth; - this.image.height = imgHeight; + this.image.width = this.pendingImage.width; + this.image.height = this.pendingImage.height; this.image.style.visibility = 'visible'; if (this.selectedSlideInSelection) { this.image.parentNode.className = 'selected'; } else { this.image.parentNode.className = ''; }