From dc502e53f9f6081d3c2bc4e9991feffcd60c15e1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <benoit.pin@gmail.com>
Date: Sun, 3 Aug 2014 15:52:31 +0200
Subject: [PATCH] =?utf8?q?shrink=20de=20l'image=20si=20=C3=A9cran=20rikiki?=
=?utf8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
skins/photo_film_viewer.js | 46 +++++++++++++++++++++++++++++++++++---
1 file changed, 43 insertions(+), 3 deletions(-)
diff --git a/skins/photo_film_viewer.js b/skins/photo_film_viewer.js
index b86e94d..16ffb88 100644
--- a/skins/photo_film_viewer.js
+++ b/skins/photo_film_viewer.js
@@ -5,7 +5,7 @@ Licence Creative Commons http://creativecommons.org/licenses/by-nc/2.0/
*/
var FilmSlider;
-
+var s;
(function(){
var keyLeft = 37, keyRight = 39;
@@ -16,6 +16,7 @@ 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;
@@ -186,6 +187,7 @@ FilmSlider.prototype._fitToScreen = function(evt) {
var src = this.image.src.replace(imgRequestedSize, 'size=' + bestFitSize);
this.pendingImage.src = src;
}
+ this.shrinkImage(this.image);
};
FilmSlider.prototype.getBestFitSize = function(ratio) {
@@ -210,6 +212,27 @@ FilmSlider.prototype.getBestFitSize = function(ratio) {
return DEFAULT_IMAGE_SIZES[i];
};
+FilmSlider.prototype.shrinkImage = function(img) {
+ var dispWidth = parseInt(this.stretchable.style.width);
+ var imgWidth = img.width;
+ var dispHeight = parseInt(this.stretchable.style.height);
+ var imgHeight = img.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;
+ }
+ img.width = imgWidth;
+ img.height = imgHeight;
+};
+
if (!browser.isMobile) {
FilmSlider.prototype.centerSlide = function(slideIndex) {
if (this.sliderRatio > 1) { return; }
@@ -721,10 +744,27 @@ 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.image.style.visibility = 'hidden';
this.image.src = this.pendingImage.src;
- this.image.width = this.pendingImage.width;
- this.image.height = this.pendingImage.height;
+ this.image.width = imgWidth;
+ this.image.height = imgHeight;
this.image.style.visibility = 'visible';
if (this.selectedSlideInSelection) { this.image.parentNode.className = 'selected'; }
else { this.image.parentNode.className = ''; }
--
2.20.1