mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer
synced 2024-09-29 13:17:35 +00:00
c594a5610a
Instead of setting the parent's height as max height of the <img> element, find the first parent which has a non-automatic height (that would be .mw-mmv-image-wrapper). With the old structure, the height of the parent element could be determined by the height of the image, which would then be written back into the max-height of the image, messing up the aspect ratio. I did not see this in the wild, but it was easy to reproduce by changing the timing of the resize handler (in particular, I tried to call the resize handler before loading the new resolution, to make the UI more responsive, and ran into this problem). This cannot happen anymore now. This also fix a bug on some browsers (IE 10, maybe iOS Safari) where the size of the image could be slightly larger than the available space, and the bottom of the image was obscured by the metadata panel. I am still not sure how exactly that happened, but it was related to the <img> parents with automatic heights having incorrect height. After making sure the <img> has a max-height derived from an element with non-automatic height, I cannot reproduce the bug on IE 10 anymore. Change-Id: I193aefc42e6d6072717643659a9e4c0c8b7c7e93 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/698 Bug: 66244
307 lines
11 KiB
JavaScript
307 lines
11 KiB
JavaScript
/*
|
|
* This file is part of the MediaWiki extension MediaViewer.
|
|
*
|
|
* MediaViewer is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* MediaViewer is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with MediaViewer. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
( function( mw, $ ) {
|
|
QUnit.module( 'mmv.ui.Canvas', QUnit.newMwEnvironment() );
|
|
|
|
QUnit.test( 'Constructor sanity check', 3, function( assert ) {
|
|
var $qf = $( '#qunit-fixture' ),
|
|
canvas = new mw.mmv.ui.Canvas( $qf, $qf, $qf );
|
|
|
|
assert.ok( canvas.$imageDiv, 'Image container is created.' );
|
|
assert.strictEqual( canvas.$imageWrapper, $qf, '$imageWrapper is set correctly.' );
|
|
assert.strictEqual( canvas.$mainWrapper, $qf, '$mainWrapper is set correctly.' );
|
|
} );
|
|
|
|
QUnit.test( 'empty() and set()', 8, function( assert ) {
|
|
var $qf = $( '#qunit-fixture' ),
|
|
canvas = new mw.mmv.ui.Canvas( $qf ),
|
|
image = new Image(),
|
|
$imageElem = $( image ),
|
|
imageRawMetadata = new mw.mmv.LightboxImage( 'foo.png' );
|
|
|
|
canvas.empty();
|
|
|
|
assert.strictEqual( canvas.$imageDiv.html(), '', 'Canvas is empty.' );
|
|
assert.ok( canvas.$imageDiv.hasClass( 'empty' ), 'Canvas is not visible.' );
|
|
|
|
canvas.set( imageRawMetadata, $imageElem );
|
|
|
|
assert.strictEqual( canvas.$image, $imageElem, 'Image element set correctly.' );
|
|
assert.strictEqual( canvas.imageRawMetadata, imageRawMetadata, 'Raw metadata set correctly.' );
|
|
assert.strictEqual( canvas.$imageDiv.html(), '<img>', 'Image added to container.' );
|
|
assert.ok( !canvas.$imageDiv.hasClass( 'empty' ), 'Canvas is visible.' );
|
|
|
|
canvas.empty();
|
|
|
|
assert.strictEqual( canvas.$imageDiv.html(), '', 'Canvas is empty.' );
|
|
assert.ok( canvas.$imageDiv.hasClass( 'empty' ), 'Canvas is not visible.' );
|
|
} );
|
|
|
|
QUnit.test( 'setImageAndMaxDimensions()', 8, function( assert ) {
|
|
var $qf = $( '#qunit-fixture' ),
|
|
$mainWrapper = $( '<div>' ).appendTo( $qf ),
|
|
$innerWrapper =$( '<div>' ).appendTo( $mainWrapper ),
|
|
$imageWrapper = $( '<div>' ).appendTo( $innerWrapper ),
|
|
canvas = new mw.mmv.ui.Canvas( $innerWrapper, $imageWrapper, $mainWrapper ),
|
|
imageRawMetadata = new mw.mmv.LightboxImage( 'foo.png' ),
|
|
image = new Image(),
|
|
$imageElem = $( image ),
|
|
image2 = new Image(),
|
|
thumbnailWidth = 10,
|
|
screenWidth = 100,
|
|
$currentImage,
|
|
originalWidth;
|
|
|
|
// Need to call set() before using setImageAndMaxDimensions()
|
|
canvas.set( imageRawMetadata, $imageElem );
|
|
originalWidth = image.width;
|
|
|
|
// Call with the same image
|
|
canvas.setImageAndMaxDimensions(
|
|
{ width: thumbnailWidth },
|
|
image,
|
|
{ cssWidth: screenWidth }
|
|
);
|
|
|
|
assert.strictEqual( image.width, originalWidth, 'Image width was not modified.' );
|
|
assert.strictEqual( canvas.$image, $imageElem, 'Image element still set correctly.' );
|
|
assert.strictEqual( canvas.$image.css( 'maxWidth' ), canvas.$imageDiv.width() + 'px', 'MaxWidth set correctly.' );
|
|
assert.strictEqual( canvas.$image.css( 'maxHeight' ), canvas.$imageDiv.height() + 'px', 'MaxHeight set correctly.' );
|
|
|
|
$currentImage = canvas.$image;
|
|
|
|
// Call with a new image bigger than screen size
|
|
thumbnailWidth = 150;
|
|
canvas.setImageAndMaxDimensions(
|
|
{ width: thumbnailWidth },
|
|
image2,
|
|
{ cssWidth: screenWidth }
|
|
);
|
|
|
|
assert.strictEqual( image2.width, screenWidth, 'Image width was trimmed correctly.' );
|
|
assert.notStrictEqual( canvas.$image, $currentImage, 'Image element switched correctly.' );
|
|
assert.strictEqual( canvas.$image.css( 'maxWidth' ), canvas.$imageDiv.width() + 'px', 'MaxWidth set correctly.' );
|
|
assert.strictEqual( canvas.$image.css( 'maxHeight' ), canvas.$imageDiv.height() + 'px', 'MaxHeight set correctly.' );
|
|
} );
|
|
|
|
QUnit.test( 'attach and unattach', 3, function( assert ) {
|
|
var $qf = $( '#qunit-fixture' ),
|
|
canvas = new mw.mmv.ui.Canvas( $qf );
|
|
|
|
assert.ok( ! canvas.resizeListener, 'resize listener has not been set yet.' );
|
|
|
|
canvas.attach();
|
|
|
|
assert.ok( canvas.resizeListener, 'resize listener is set.' );
|
|
|
|
canvas.unattach();
|
|
|
|
assert.ok( ! canvas.resizeListener, 'resize listener has been removed.' );
|
|
} );
|
|
|
|
QUnit.test( 'maybeDisplayPlaceholder: Constrained area for SVG files', 4, function ( assert ) {
|
|
var $image,
|
|
blurredThumbnailShown,
|
|
$qf = $( '#qunit-fixture' ),
|
|
imageRawMetadata = new mw.mmv.LightboxImage( 'foo.svg' ),
|
|
canvas = new mw.mmv.ui.Canvas( $qf );
|
|
|
|
imageRawMetadata.filePageTitle = {
|
|
getExtension: function() { return 'svg'; }
|
|
};
|
|
canvas.imageRawMetadata = imageRawMetadata;
|
|
|
|
canvas.set = function () {
|
|
assert.ok ( false, 'Placeholder is not shown');
|
|
};
|
|
|
|
$image = $( '<img>' ).width( 10 ).height( 5 );
|
|
|
|
blurredThumbnailShown = canvas.maybeDisplayPlaceholder(
|
|
{ width : 200, height : 100 },
|
|
$image,
|
|
{ cssWidth : 300, cssHeight: 150 }
|
|
);
|
|
|
|
assert.strictEqual( $image.width(), 10, 'Placeholder width was not set to max' );
|
|
assert.strictEqual( $image.height(), 5, 'Placeholder height was not set to max' );
|
|
assert.ok( ! $image.hasClass( 'blurred' ), 'Placeholder is not blurred' );
|
|
assert.ok( ! blurredThumbnailShown, 'Placeholder state is correct' );
|
|
} );
|
|
|
|
QUnit.test( 'maybeDisplayPlaceholder: placeholder big enough that it doesn\'t need blurring, actual image bigger than the lightbox', 5, function ( assert ) {
|
|
var $image,
|
|
blurredThumbnailShown,
|
|
$qf = $( '#qunit-fixture' ),
|
|
imageRawMetadata = new mw.mmv.LightboxImage( 'foo.png' ),
|
|
canvas = new mw.mmv.ui.Canvas( $qf );
|
|
|
|
imageRawMetadata.filePageTitle = {
|
|
getExtension: function() { return 'png'; }
|
|
};
|
|
canvas.imageRawMetadata = imageRawMetadata;
|
|
|
|
canvas.set = function () {
|
|
assert.ok ( true, 'Placeholder shown');
|
|
};
|
|
|
|
$image = $( '<img>' ).width( 200 ).height( 100 );
|
|
|
|
blurredThumbnailShown = canvas.maybeDisplayPlaceholder(
|
|
{ width : 1000, height : 500 },
|
|
$image,
|
|
{ cssWidth : 300, cssHeight: 150 }
|
|
);
|
|
|
|
assert.strictEqual( $image.width(), 300, 'Placeholder has the right width' );
|
|
assert.strictEqual( $image.height(), 150, 'Placeholder has the right height' );
|
|
assert.ok( ! $image.hasClass( 'blurred' ), 'Placeholder is not blurred' );
|
|
assert.ok( ! blurredThumbnailShown, 'Placeholder state is correct' );
|
|
} );
|
|
|
|
QUnit.test( 'maybeDisplayPlaceholder: big-enough placeholder that needs blurring, actual image bigger than the lightbox', 5, function ( assert ) {
|
|
var $image,
|
|
blurredThumbnailShown,
|
|
$qf = $( '#qunit-fixture' ),
|
|
imageRawMetadata = new mw.mmv.LightboxImage( 'foo.png' ),
|
|
canvas = new mw.mmv.ui.Canvas( $qf );
|
|
|
|
imageRawMetadata.filePageTitle = {
|
|
getExtension: function() { return 'png'; }
|
|
};
|
|
canvas.imageRawMetadata = imageRawMetadata;
|
|
|
|
canvas.set = function () {
|
|
assert.ok ( true, 'Placeholder shown');
|
|
};
|
|
|
|
$image = $( '<img>' ).width( 100 ).height( 50 );
|
|
|
|
blurredThumbnailShown = canvas.maybeDisplayPlaceholder(
|
|
{ width : 1000, height : 500 },
|
|
$image,
|
|
{ cssWidth : 300, cssHeight : 150 }
|
|
);
|
|
|
|
assert.strictEqual( $image.width(), 300, 'Placeholder has the right width' );
|
|
assert.strictEqual( $image.height(), 150, 'Placeholder has the right height' );
|
|
assert.ok( $image.hasClass( 'blurred' ), 'Placeholder is blurred' );
|
|
assert.ok( blurredThumbnailShown, 'Placeholder state is correct' );
|
|
} );
|
|
|
|
QUnit.test( 'maybeDisplayPlaceholder: big-enough placeholder that needs blurring, actual image smaller than the lightbox', 5, function ( assert ) {
|
|
var $image,
|
|
blurredThumbnailShown,
|
|
$qf = $( '#qunit-fixture' ),
|
|
imageRawMetadata = new mw.mmv.LightboxImage( 'foo.png' ),
|
|
canvas = new mw.mmv.ui.Canvas( $qf );
|
|
|
|
imageRawMetadata.filePageTitle = {
|
|
getExtension: function() { return 'png'; }
|
|
};
|
|
canvas.imageRawMetadata = imageRawMetadata;
|
|
|
|
canvas.set = function () {
|
|
assert.ok ( true, 'Placeholder shown');
|
|
};
|
|
|
|
$image = $( '<img>' ).width( 100 ).height( 50 );
|
|
|
|
blurredThumbnailShown = canvas.maybeDisplayPlaceholder(
|
|
{ width : 1000, height : 500 },
|
|
$image,
|
|
{ cssWidth : 1200, cssHeight : 600 }
|
|
);
|
|
|
|
assert.strictEqual( $image.width(), 1000, 'Placeholder has the right width' );
|
|
assert.strictEqual( $image.height(), 500, 'Placeholder has the right height' );
|
|
assert.ok( $image.hasClass( 'blurred' ), 'Placeholder is blurred' );
|
|
assert.ok( blurredThumbnailShown, 'Placeholder state is correct' );
|
|
} );
|
|
|
|
QUnit.test( 'maybeDisplayPlaceholder: placeholder too small to be displayed, actual image bigger than the lightbox', 4, function ( assert ) {
|
|
var $image,
|
|
blurredThumbnailShown,
|
|
$qf = $( '#qunit-fixture' ),
|
|
imageRawMetadata = new mw.mmv.LightboxImage( 'foo.png' ),
|
|
canvas = new mw.mmv.ui.Canvas( $qf );
|
|
|
|
imageRawMetadata.filePageTitle = {
|
|
getExtension: function() { return 'png'; }
|
|
};
|
|
canvas.imageRawMetadata = imageRawMetadata;
|
|
|
|
canvas.set = function () {
|
|
assert.ok ( false, 'Placeholder shown when it should not');
|
|
};
|
|
|
|
$image = $( '<img>' ).width( 10 ).height( 5 );
|
|
|
|
blurredThumbnailShown = canvas.maybeDisplayPlaceholder(
|
|
{ width : 1000, height : 500 },
|
|
$image,
|
|
{ cssWidth : 300, cssHeight : 150 }
|
|
);
|
|
|
|
assert.strictEqual( $image.width(), 10, 'Placeholder has the right width' );
|
|
assert.strictEqual( $image.height(), 5, 'Placeholder has the right height' );
|
|
assert.ok( ! $image.hasClass( 'blurred' ), 'Placeholder is not blurred' );
|
|
assert.ok( ! blurredThumbnailShown, 'Placeholder state is correct' );
|
|
} );
|
|
|
|
QUnit.test( 'Unblur', 4, function ( assert ) {
|
|
var $qf = $( '#qunit-fixture' ),
|
|
canvas = new mw.mmv.ui.Canvas( $qf ),
|
|
oldAnimate = $.fn.animate;
|
|
|
|
$.fn.animate = function ( target, options ) {
|
|
var self = this,
|
|
lastValue;
|
|
|
|
$.each( target, function ( key, value ) {
|
|
lastValue = self.key = value;
|
|
} );
|
|
|
|
if ( options ) {
|
|
if ( options.step ) {
|
|
options.step.call( this, lastValue );
|
|
}
|
|
|
|
if ( options.complete ) {
|
|
options.complete.call( this );
|
|
}
|
|
}
|
|
};
|
|
|
|
canvas.$image = $( '<img>' );
|
|
|
|
canvas.unblurWithAnimation();
|
|
|
|
assert.ok( ! canvas.$image.css( '-webkit-filter' ) || !canvas.$image.css( '-webkit-filter' ).length,
|
|
'Image has no -webkit-filter left' );
|
|
assert.ok( ! canvas.$image.css( 'filter' ) || !canvas.$image.css( 'filter' ).length || canvas.$image.css( 'filter' ) === 'none',
|
|
'Image has no filter left' );
|
|
assert.strictEqual( parseInt( canvas.$image.css( 'opacity' ), 10 ), 1,
|
|
'Image is fully opaque' );
|
|
assert.ok( ! canvas.$image.hasClass( 'blurred' ), 'Image has no "blurred" class' );
|
|
|
|
$.fn.animate = oldAnimate;
|
|
} );
|
|
|
|
}( mediaWiki, jQuery ) );
|