maniaquerie

[Portfolio.git] / skins / photo_film_viewer.js

diff --git a/skins/photo_film_viewer.js b/skins/photo_film_viewer.js
index 16ffb88..c6f583b 100644 (file)
--- 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 FilmSlider;

-var s;

 (function(){
 
 var keyLeft = 37, keyRight = 39;
 (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;
 
 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;
        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;
        }
                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) {
 };
 
 FilmSlider.prototype.getBestFitSize = function(ratio) {


@@ -212,11 +210,11 @@ FilmSlider.prototype.getBestFitSize = function(ratio) {
        return DEFAULT_IMAGE_SIZES[i];
 };
 
        return DEFAULT_IMAGE_SIZES[i];
 };
 

-FilmSlider.prototype.shrinkImage = function(img) {
+FilmSlider.prototype.adjustImage = function(img) {

        var dispWidth = parseInt(this.stretchable.style.width);
        var dispWidth = parseInt(this.stretchable.style.width);

-       var imgWidth = img.width;
+       var imgWidth = img.naturalWidth;

        var dispHeight = parseInt(this.stretchable.style.height);
        var dispHeight = parseInt(this.stretchable.style.height);

-       var imgHeight = img.height;
+       var imgHeight = img.naturalHeight;

        var ratio;
 
        if (imgHeight > dispHeight) {
        var ratio;
 
        if (imgHeight > dispHeight) {


@@ -744,27 +742,11 @@ FilmSlider.prototype.populateViewer = function(req) {
 };
 
 FilmSlider.prototype.refreshImage = function() {
 };
 
 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.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 = ''; }
        this.image.style.visibility = 'visible';
        if (this.selectedSlideInSelection) { this.image.parentNode.className = 'selected'; }
        else { this.image.parentNode.className = ''; }