wikimedia/mediawiki-extensions-MultimediaViewer
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer synced 2024-09-29 05:07:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Match size of preview and real image"

Browse source
This commit is contained in:
jenkins-bot 2015-01-23 22:16:58 +00:00 committed by Gerrit Code Review
parent 94ae57549e adbf42280e
commit 6bde670acc
2 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
resources/mmv/ui/mmv.ui.canvas.js
View file

@ -116,19 +116,6 @@
this.$imageDiv.html( this.$image );
};
/**
* Sets max-width and max-height of the image equal to those of its parent element.
* FIXME what is this good for, actually?
*/
C.setImageMaxDimensions = function () {
this.$image.css( {
maxWidth : this.$image.parent().width(),
// for height, use closest ancestor which has non-content-defined height;
// otherwise this could be determined by the height of the image.
maxHeight : this.$imageWrapper.height()
} );
};
/**
* Sets contained image and also the max dimensions. Called while resizing the viewer.
* Assumes set function called before.
@ -153,8 +140,6 @@
this.setUpImageClick();
}
this.setImageMaxDimensions();
};
/**

6
tests/qunit/mmv/ui/mmv.ui.canvas.test.js
View file

@ -52,7 +52,7 @@
assert.ok( canvas.$imageDiv.hasClass( 'empty' ), 'Canvas is not visible.' );
} );
QUnit.test( 'setImageAndMaxDimensions()', 8, function ( assert ) {
QUnit.test( 'setImageAndMaxDimensions()', 4, function ( assert ) {
var $qf = $( '#qunit-fixture' ),
$mainWrapper = $( '<div>' ).appendTo( $qf ),
$innerWrapper =$( '<div>' ).appendTo( $mainWrapper ),
@ -80,8 +80,6 @@
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;
@ -95,8 +93,6 @@
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( 'maybeDisplayPlaceholder: Constrained area for SVG files', 4, function ( assert ) {