2014-02-26 20:09:37 +00:00
|
|
|
|
/*
|
|
|
|
|
* 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, $, oo ) {
|
|
|
|
|
var C;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* UI component that contains the multimedia element to be displayed.
|
|
|
|
|
* This first version assumes an image but it can be extended to other
|
|
|
|
|
* media types (video, sound, presentation, etc.).
|
|
|
|
|
*
|
|
|
|
|
* @class mw.mmv.ui.Canvas
|
|
|
|
|
* @extends mw.mmv.ui.Element
|
|
|
|
|
* @constructor
|
|
|
|
|
* @param {jQuery} $container Canvas' container
|
|
|
|
|
* @param {jQuery} $imageWrapper
|
|
|
|
|
* @param {jQuery} $mainWrapper
|
|
|
|
|
*/
|
|
|
|
|
function Canvas( $container, $imageWrapper, $mainWrapper ) {
|
|
|
|
|
mw.mmv.ui.Element.call( this, $container );
|
|
|
|
|
|
2014-09-27 02:03:14 +00:00
|
|
|
|
/**
|
|
|
|
|
* @property {boolean}
|
|
|
|
|
* @private
|
|
|
|
|
*/
|
|
|
|
|
this.dialogOpen = false;
|
|
|
|
|
|
2014-02-26 20:09:37 +00:00
|
|
|
|
/**
|
|
|
|
|
* @property {mw.mmv.ThumbnailWidthCalculator}
|
|
|
|
|
* @private
|
|
|
|
|
*/
|
|
|
|
|
this.thumbnailWidthCalculator = new mw.mmv.ThumbnailWidthCalculator();
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Contains image.
|
|
|
|
|
* @property {jQuery}
|
|
|
|
|
*/
|
|
|
|
|
this.$imageDiv = $( '<div>' )
|
2014-03-31 21:33:12 +00:00
|
|
|
|
.addClass( 'mw-mmv-image' );
|
2014-02-26 20:09:37 +00:00
|
|
|
|
|
|
|
|
|
this.$imageDiv.appendTo( this.$container );
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Container of canvas and controls, needed for canvas size calculations.
|
|
|
|
|
* @property {jQuery}
|
|
|
|
|
* @private
|
|
|
|
|
*/
|
|
|
|
|
this.$imageWrapper = $imageWrapper;
|
|
|
|
|
|
|
|
|
|
/**
|
2014-06-26 01:26:49 +00:00
|
|
|
|
* Main container of image and metadata, needed to propagate events.
|
2014-02-26 20:09:37 +00:00
|
|
|
|
* @property {jQuery}
|
|
|
|
|
* @private
|
|
|
|
|
*/
|
|
|
|
|
this.$mainWrapper = $mainWrapper;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Raw metadata of current image, needed for canvas size calculations.
|
|
|
|
|
* @property {mw.mmv.LightboxImage}
|
|
|
|
|
* @private
|
|
|
|
|
*/
|
|
|
|
|
this.imageRawMetadata = null;
|
|
|
|
|
}
|
|
|
|
|
oo.inheritClass( Canvas, mw.mmv.ui.Element );
|
|
|
|
|
C = Canvas.prototype;
|
|
|
|
|
|
2014-04-02 01:58:41 +00:00
|
|
|
|
/**
|
|
|
|
|
* Maximum blownup factor tolerated
|
2014-04-29 18:31:16 +00:00
|
|
|
|
* @property MAX_BLOWUP_FACTOR
|
2014-04-02 01:58:41 +00:00
|
|
|
|
* @static
|
|
|
|
|
*/
|
2014-03-04 01:58:27 +00:00
|
|
|
|
Canvas.MAX_BLOWUP_FACTOR = 11;
|
|
|
|
|
|
2014-04-02 01:58:41 +00:00
|
|
|
|
/**
|
|
|
|
|
* Blowup factor threshold at which blurring kicks in
|
2014-04-29 18:31:16 +00:00
|
|
|
|
* @property BLUR_BLOWUP_FACTOR_THRESHOLD
|
2014-04-02 01:58:41 +00:00
|
|
|
|
* @static
|
|
|
|
|
*/
|
2014-03-04 01:58:27 +00:00
|
|
|
|
Canvas.BLUR_BLOWUP_FACTOR_THRESHOLD = 2;
|
|
|
|
|
|
2014-02-26 20:09:37 +00:00
|
|
|
|
/**
|
|
|
|
|
* Clears everything.
|
|
|
|
|
*/
|
|
|
|
|
C.empty = function() {
|
2014-03-01 01:10:51 +00:00
|
|
|
|
this.$imageDiv.addClass( 'empty' ).removeClass( 'error' );
|
2014-02-26 20:09:37 +00:00
|
|
|
|
|
|
|
|
|
this.$imageDiv.empty();
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Sets contained image.
|
|
|
|
|
* @param {mw.mmv.LightboxImage} imageRawMetadata
|
|
|
|
|
* @param {jQuery} $imageElement
|
|
|
|
|
*/
|
|
|
|
|
C.set = function( imageRawMetadata, $imageElement ) {
|
|
|
|
|
this.$imageDiv.removeClass( 'empty' );
|
|
|
|
|
|
|
|
|
|
this.imageRawMetadata = imageRawMetadata;
|
|
|
|
|
this.$image = $imageElement;
|
2014-09-04 21:50:14 +00:00
|
|
|
|
this.setUpImageClick();
|
2014-02-26 20:09:37 +00:00
|
|
|
|
|
|
|
|
|
this.$imageDiv.html( this.$image );
|
|
|
|
|
};
|
|
|
|
|
|
Make max-height computation more stable
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
2014-06-17 21:16:26 +00:00
|
|
|
|
/**
|
|
|
|
|
* 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()
|
|
|
|
|
} );
|
|
|
|
|
};
|
|
|
|
|
|
2014-02-26 20:09:37 +00:00
|
|
|
|
/**
|
|
|
|
|
* Sets contained image and also the max dimensions. Called while resizing the viewer.
|
|
|
|
|
* Assumes set function called before.
|
2014-03-04 01:58:27 +00:00
|
|
|
|
* @param {mw.mmv.model.Thumbnail} thumbnail thumbnail information
|
Refactor progressbar & blur handling
This tries to fix a number of related issues:
* the blurred thumbnail was visible for a split-second sometimes
when switching back to an already-loaded image. (Presumably when
JS was sluggish enough to take more than 10 ms to execute.) We
now check whether the promise is pending before showing a placeholder.
(More generally, a lot of unnecessary logic was executed when paging
through already loaded images, like displaying the placeholder, so
this might make the UI a bit more responsive.)
* the blur could get stuck sometimes - I have seen this a few times,
but have never been able to reproduce it, so I'm only guessing, but
maybe the timing was really unfortunate, and we switched back less
than 10 ms before loading finished. We now remove the blur on every
branch, just to be sure.
* adding a progress handler to a promise might not have any immediate
effect, so when switching to an image which was loading, the progress
bar reacted too late. We now store the progress state per thumbnail
so it is always available immediately.
* the progress would animate from 0 to its actual state whenever we
navigated to the image. The change on paging is now instant; the
progress bar only animates when we are looking at it.
* switching quickly back and forthe between a loaded and a loading
image resulted in the loading image becoming unblurred. This seems
fixed now, I'm not sure why. Maybe the "skip on non-pending promise"
logic affects it somehow.
Also removes some unused things / renames some things which were
confusing, and makes an unrelated fix in the image provider, which kept
amassing fail handlers.
Change-Id: I580becff246f197ec1bc65e82acd422620e35578
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/489
2014-04-25 22:26:34 +00:00
|
|
|
|
* @param {HTMLImageElement} imageElement
|
2014-03-04 01:58:27 +00:00
|
|
|
|
* @param {mw.mmv.model.ThumbnailWidth} imageWidths
|
2014-02-26 20:09:37 +00:00
|
|
|
|
*/
|
Refactor progressbar & blur handling
This tries to fix a number of related issues:
* the blurred thumbnail was visible for a split-second sometimes
when switching back to an already-loaded image. (Presumably when
JS was sluggish enough to take more than 10 ms to execute.) We
now check whether the promise is pending before showing a placeholder.
(More generally, a lot of unnecessary logic was executed when paging
through already loaded images, like displaying the placeholder, so
this might make the UI a bit more responsive.)
* the blur could get stuck sometimes - I have seen this a few times,
but have never been able to reproduce it, so I'm only guessing, but
maybe the timing was really unfortunate, and we switched back less
than 10 ms before loading finished. We now remove the blur on every
branch, just to be sure.
* adding a progress handler to a promise might not have any immediate
effect, so when switching to an image which was loading, the progress
bar reacted too late. We now store the progress state per thumbnail
so it is always available immediately.
* the progress would animate from 0 to its actual state whenever we
navigated to the image. The change on paging is now instant; the
progress bar only animates when we are looking at it.
* switching quickly back and forthe between a loaded and a loading
image resulted in the loading image becoming unblurred. This seems
fixed now, I'm not sure why. Maybe the "skip on non-pending promise"
logic affects it somehow.
Also removes some unused things / renames some things which were
confusing, and makes an unrelated fix in the image provider, which kept
amassing fail handlers.
Change-Id: I580becff246f197ec1bc65e82acd422620e35578
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/489
2014-04-25 22:26:34 +00:00
|
|
|
|
C.setImageAndMaxDimensions = function( thumbnail, imageElement, imageWidths ) {
|
|
|
|
|
var $image = $( imageElement );
|
2014-02-26 20:09:37 +00:00
|
|
|
|
|
2014-03-04 01:58:27 +00:00
|
|
|
|
// we downscale larger images but do not scale up smaller ones, that would look ugly
|
|
|
|
|
if ( thumbnail.width > imageWidths.cssWidth ) {
|
Refactor progressbar & blur handling
This tries to fix a number of related issues:
* the blurred thumbnail was visible for a split-second sometimes
when switching back to an already-loaded image. (Presumably when
JS was sluggish enough to take more than 10 ms to execute.) We
now check whether the promise is pending before showing a placeholder.
(More generally, a lot of unnecessary logic was executed when paging
through already loaded images, like displaying the placeholder, so
this might make the UI a bit more responsive.)
* the blur could get stuck sometimes - I have seen this a few times,
but have never been able to reproduce it, so I'm only guessing, but
maybe the timing was really unfortunate, and we switched back less
than 10 ms before loading finished. We now remove the blur on every
branch, just to be sure.
* adding a progress handler to a promise might not have any immediate
effect, so when switching to an image which was loading, the progress
bar reacted too late. We now store the progress state per thumbnail
so it is always available immediately.
* the progress would animate from 0 to its actual state whenever we
navigated to the image. The change on paging is now instant; the
progress bar only animates when we are looking at it.
* switching quickly back and forthe between a loaded and a loading
image resulted in the loading image becoming unblurred. This seems
fixed now, I'm not sure why. Maybe the "skip on non-pending promise"
logic affects it somehow.
Also removes some unused things / renames some things which were
confusing, and makes an unrelated fix in the image provider, which kept
amassing fail handlers.
Change-Id: I580becff246f197ec1bc65e82acd422620e35578
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/489
2014-04-25 22:26:34 +00:00
|
|
|
|
imageElement.width = imageWidths.cssWidth;
|
2014-03-04 01:58:27 +00:00
|
|
|
|
}
|
|
|
|
|
|
Make max-height computation more stable
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
2014-06-17 21:16:26 +00:00
|
|
|
|
if ( !this.$image.is( imageElement ) ) { // http://bugs.jquery.com/ticket/4087
|
|
|
|
|
this.$image.replaceWith( $image );
|
|
|
|
|
this.$image = $image;
|
2014-09-04 21:50:14 +00:00
|
|
|
|
|
2014-09-24 23:19:03 +00:00
|
|
|
|
// Since the image element got replaced, we need to rescue the dialog-open class.
|
|
|
|
|
this.$image.toggleClass( 'mw-mmv-dialog-is-open', this.dialogOpen );
|
|
|
|
|
|
2014-09-04 21:50:14 +00:00
|
|
|
|
this.setUpImageClick();
|
2014-02-26 20:09:37 +00:00
|
|
|
|
}
|
|
|
|
|
|
Make max-height computation more stable
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
2014-06-17 21:16:26 +00:00
|
|
|
|
this.setImageMaxDimensions();
|
2014-02-26 20:09:37 +00:00
|
|
|
|
};
|
|
|
|
|
|
2014-09-12 18:05:13 +00:00
|
|
|
|
/**
|
2014-09-19 18:34:18 +00:00
|
|
|
|
* Handles a "dialog open/close" event from dialogs on the page.
|
2014-09-12 18:05:13 +00:00
|
|
|
|
*/
|
2014-09-19 18:34:18 +00:00
|
|
|
|
C.handleDialogEvent = function ( e ) {
|
|
|
|
|
switch ( e.type ) {
|
|
|
|
|
case 'mmv-download-opened':
|
|
|
|
|
this.downloadOpen = true;
|
|
|
|
|
break;
|
|
|
|
|
case 'mmv-download-closed':
|
|
|
|
|
this.downloadOpen = false;
|
|
|
|
|
break;
|
|
|
|
|
case 'mmv-reuse-opened':
|
|
|
|
|
this.reuseOpen = true;
|
|
|
|
|
break;
|
|
|
|
|
case 'mmv-reuse-closed':
|
|
|
|
|
this.reuseOpen = false;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2014-09-12 18:05:13 +00:00
|
|
|
|
|
2014-09-19 18:34:18 +00:00
|
|
|
|
this.dialogOpen = this.reuseOpen || this.downloadOpen;
|
|
|
|
|
this.$image.toggleClass( 'mw-mmv-dialog-is-open', this.dialogOpen );
|
2014-09-12 18:05:13 +00:00
|
|
|
|
};
|
|
|
|
|
|
2014-09-04 21:50:14 +00:00
|
|
|
|
/**
|
2014-09-11 17:39:19 +00:00
|
|
|
|
* Registers click listener on the image.
|
2014-09-04 21:50:14 +00:00
|
|
|
|
*/
|
|
|
|
|
C.setUpImageClick = function () {
|
2014-09-12 18:05:13 +00:00
|
|
|
|
var canvas = this;
|
|
|
|
|
|
2014-09-19 18:34:18 +00:00
|
|
|
|
this.handleEvent( 'mmv-reuse-opened', $.proxy( this.handleDialogEvent, this ) );
|
|
|
|
|
this.handleEvent( 'mmv-reuse-closed', $.proxy( this.handleDialogEvent, this ) );
|
|
|
|
|
this.handleEvent( 'mmv-download-opened', $.proxy( this.handleDialogEvent, this ) );
|
|
|
|
|
this.handleEvent( 'mmv-download-closed', $.proxy( this.handleDialogEvent, this ) );
|
2014-09-12 18:05:13 +00:00
|
|
|
|
|
2014-09-04 21:50:14 +00:00
|
|
|
|
this.$image
|
|
|
|
|
.on( 'click.mmv-view-original', function () {
|
2014-09-12 18:05:13 +00:00
|
|
|
|
if ( !canvas.dialogOpen ) {
|
|
|
|
|
mw.mmv.actionLogger.log( 'view-original-file' ).always( function() {
|
|
|
|
|
$( document ).trigger( 'mmv-viewfile' );
|
|
|
|
|
} );
|
|
|
|
|
}
|
2014-09-04 21:50:14 +00:00
|
|
|
|
} );
|
|
|
|
|
};
|
|
|
|
|
|
2014-02-26 20:09:37 +00:00
|
|
|
|
/**
|
|
|
|
|
* Registers listeners.
|
|
|
|
|
*/
|
|
|
|
|
C.attach = function() {
|
|
|
|
|
var canvas = this;
|
|
|
|
|
|
2014-09-30 14:16:08 +00:00
|
|
|
|
$( window ).on( 'resize.mmv-canvas', $.debounce( 100, function () {
|
|
|
|
|
canvas.$mainWrapper.trigger( $.Event( 'mmv-resize-end' ) );
|
|
|
|
|
} ) );
|
2014-06-26 01:26:49 +00:00
|
|
|
|
|
|
|
|
|
this.$imageDiv.on( 'click.mmv-canvas', 'img', function () {
|
|
|
|
|
canvas.$mainWrapper.trigger( $.Event( 'mmv-image-click' ) );
|
|
|
|
|
} );
|
2014-02-26 20:09:37 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Clears listeners.
|
|
|
|
|
*/
|
|
|
|
|
C.unattach = function() {
|
|
|
|
|
this.clearEvents();
|
|
|
|
|
|
2014-09-09 08:56:13 +00:00
|
|
|
|
$( window ).off( 'resize.mmv-canvas' );
|
2014-06-26 01:26:49 +00:00
|
|
|
|
|
|
|
|
|
this.$imageDiv.off( 'click.mmv-canvas' );
|
2014-09-04 21:50:14 +00:00
|
|
|
|
|
|
|
|
|
if ( this.$image ) {
|
|
|
|
|
this.$image.tipsy( 'hide' );
|
|
|
|
|
}
|
2014-02-26 20:09:37 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
2014-03-04 01:58:27 +00:00
|
|
|
|
* Sets page thumbnail for display if blowupFactor <= MAX_BLOWUP_FACTOR. Otherwise thumb is not set.
|
|
|
|
|
* The image gets also blured to avoid pixelation if blowupFactor > BLUR_BLOWUP_FACTOR_THRESHOLD.
|
|
|
|
|
* We set SVG files to the maximum screen size available.
|
|
|
|
|
* Assumes set function called before.
|
2014-02-26 20:09:37 +00:00
|
|
|
|
*
|
2014-04-24 01:03:24 +00:00
|
|
|
|
* @param {{width: number, height: number}} size
|
2014-03-04 01:58:27 +00:00
|
|
|
|
* @param {jQuery} $imagePlaceholder Image placeholder to be displayed while the real image loads.
|
2014-02-26 20:09:37 +00:00
|
|
|
|
* @param {mw.mmv.model.ThumbnailWidth} imageWidths
|
|
|
|
|
* @returns {boolean} Whether the image was blured or not
|
|
|
|
|
*/
|
2014-04-24 01:03:24 +00:00
|
|
|
|
C.maybeDisplayPlaceholder = function ( size, $imagePlaceholder, imageWidths ) {
|
2014-03-04 01:58:27 +00:00
|
|
|
|
var targetWidth,
|
2014-02-26 20:09:37 +00:00
|
|
|
|
targetHeight,
|
|
|
|
|
blowupFactor,
|
2014-04-15 00:01:03 +00:00
|
|
|
|
blurredThumbnailShown = false;
|
2014-03-04 01:58:27 +00:00
|
|
|
|
|
|
|
|
|
// Assume natural thumbnail size¸
|
2014-04-24 01:03:24 +00:00
|
|
|
|
targetWidth = size.width;
|
|
|
|
|
targetHeight = size.height;
|
2014-03-04 01:58:27 +00:00
|
|
|
|
|
|
|
|
|
// If the image is bigger than the screen we need to resize it
|
2014-04-24 01:03:24 +00:00
|
|
|
|
if ( size.width > imageWidths.cssWidth ) { // This assumes imageInfo.width in CSS units
|
2014-03-04 01:58:27 +00:00
|
|
|
|
targetWidth = imageWidths.cssWidth;
|
|
|
|
|
targetHeight = imageWidths.cssHeight;
|
2014-02-26 20:09:37 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-03-04 01:58:27 +00:00
|
|
|
|
blowupFactor = targetWidth / $imagePlaceholder.width();
|
2014-02-26 20:09:37 +00:00
|
|
|
|
|
|
|
|
|
// If the placeholder is too blown up, it's not worth showing it
|
2014-03-04 01:58:27 +00:00
|
|
|
|
if ( blowupFactor > Canvas.MAX_BLOWUP_FACTOR ) {
|
2014-02-26 20:09:37 +00:00
|
|
|
|
return blurredThumbnailShown;
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-04 01:58:27 +00:00
|
|
|
|
$imagePlaceholder.width( targetWidth );
|
|
|
|
|
$imagePlaceholder.height( targetHeight );
|
2014-02-26 20:09:37 +00:00
|
|
|
|
|
|
|
|
|
// Only blur the placeholder if it's blown up significantly
|
2014-03-04 01:58:27 +00:00
|
|
|
|
if ( blowupFactor > Canvas.BLUR_BLOWUP_FACTOR_THRESHOLD ) {
|
|
|
|
|
this.blur( $imagePlaceholder );
|
2014-02-26 20:09:37 +00:00
|
|
|
|
blurredThumbnailShown = true;
|
|
|
|
|
}
|
|
|
|
|
|
2014-03-04 01:58:27 +00:00
|
|
|
|
this.set( this.imageRawMetadata, $imagePlaceholder.show() );
|
2014-02-26 20:09:37 +00:00
|
|
|
|
|
|
|
|
|
return blurredThumbnailShown;
|
|
|
|
|
};
|
|
|
|
|
|
2014-03-04 01:58:27 +00:00
|
|
|
|
/**
|
|
|
|
|
* Blur image
|
|
|
|
|
* @param {jQuery} $image Image to be blurred.
|
|
|
|
|
*/
|
|
|
|
|
C.blur = function( $image ) {
|
|
|
|
|
// We have to apply the SVG filter here, it doesn't work when defined in the .less file
|
|
|
|
|
// We can't use an external SVG file because filters can't be accessed cross-domain
|
|
|
|
|
// We can't embed the SVG file because accessing the filter inside of it doesn't work
|
|
|
|
|
$image.addClass( 'blurred' ).css( 'filter', 'url("#gaussian-blur")' );
|
|
|
|
|
};
|
|
|
|
|
|
2014-02-26 20:09:37 +00:00
|
|
|
|
/**
|
|
|
|
|
* Animates the image into focus
|
|
|
|
|
*/
|
Refactor progressbar & blur handling
This tries to fix a number of related issues:
* the blurred thumbnail was visible for a split-second sometimes
when switching back to an already-loaded image. (Presumably when
JS was sluggish enough to take more than 10 ms to execute.) We
now check whether the promise is pending before showing a placeholder.
(More generally, a lot of unnecessary logic was executed when paging
through already loaded images, like displaying the placeholder, so
this might make the UI a bit more responsive.)
* the blur could get stuck sometimes - I have seen this a few times,
but have never been able to reproduce it, so I'm only guessing, but
maybe the timing was really unfortunate, and we switched back less
than 10 ms before loading finished. We now remove the blur on every
branch, just to be sure.
* adding a progress handler to a promise might not have any immediate
effect, so when switching to an image which was loading, the progress
bar reacted too late. We now store the progress state per thumbnail
so it is always available immediately.
* the progress would animate from 0 to its actual state whenever we
navigated to the image. The change on paging is now instant; the
progress bar only animates when we are looking at it.
* switching quickly back and forthe between a loaded and a loading
image resulted in the loading image becoming unblurred. This seems
fixed now, I'm not sure why. Maybe the "skip on non-pending promise"
logic affects it somehow.
Also removes some unused things / renames some things which were
confusing, and makes an unrelated fix in the image provider, which kept
amassing fail handlers.
Change-Id: I580becff246f197ec1bc65e82acd422620e35578
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/489
2014-04-25 22:26:34 +00:00
|
|
|
|
C.unblurWithAnimation = function() {
|
2014-02-26 20:09:37 +00:00
|
|
|
|
var self = this,
|
|
|
|
|
animationLength = 300;
|
|
|
|
|
|
|
|
|
|
// The blurred class has an opacity < 1. This animated the image to become fully opaque
|
|
|
|
|
this.$image
|
|
|
|
|
.addClass( 'blurred' )
|
|
|
|
|
.animate( { opacity: 1.0 }, animationLength );
|
|
|
|
|
|
|
|
|
|
// During the same amount of time (animationLength) we animate a blur value from 3.0 to 0.0
|
|
|
|
|
// We pass that value to an inline CSS Gaussian blur effect
|
|
|
|
|
$( { blur: 3.0 } ).animate( { blur: 0.0 }, {
|
|
|
|
|
duration: animationLength,
|
|
|
|
|
step: function ( step ) {
|
|
|
|
|
self.$image.css( { '-webkit-filter' : 'blur(' + step + 'px)',
|
|
|
|
|
'filter' : 'blur(' + step + 'px)' } );
|
|
|
|
|
},
|
|
|
|
|
complete: function () {
|
Refactor progressbar & blur handling
This tries to fix a number of related issues:
* the blurred thumbnail was visible for a split-second sometimes
when switching back to an already-loaded image. (Presumably when
JS was sluggish enough to take more than 10 ms to execute.) We
now check whether the promise is pending before showing a placeholder.
(More generally, a lot of unnecessary logic was executed when paging
through already loaded images, like displaying the placeholder, so
this might make the UI a bit more responsive.)
* the blur could get stuck sometimes - I have seen this a few times,
but have never been able to reproduce it, so I'm only guessing, but
maybe the timing was really unfortunate, and we switched back less
than 10 ms before loading finished. We now remove the blur on every
branch, just to be sure.
* adding a progress handler to a promise might not have any immediate
effect, so when switching to an image which was loading, the progress
bar reacted too late. We now store the progress state per thumbnail
so it is always available immediately.
* the progress would animate from 0 to its actual state whenever we
navigated to the image. The change on paging is now instant; the
progress bar only animates when we are looking at it.
* switching quickly back and forthe between a loaded and a loading
image resulted in the loading image becoming unblurred. This seems
fixed now, I'm not sure why. Maybe the "skip on non-pending promise"
logic affects it somehow.
Also removes some unused things / renames some things which were
confusing, and makes an unrelated fix in the image provider, which kept
amassing fail handlers.
Change-Id: I580becff246f197ec1bc65e82acd422620e35578
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/489
2014-04-25 22:26:34 +00:00
|
|
|
|
// When the animation is complete, the blur value is 0, clean things up
|
|
|
|
|
self.unblur();
|
2014-02-26 20:09:37 +00:00
|
|
|
|
}
|
|
|
|
|
} );
|
|
|
|
|
};
|
|
|
|
|
|
2014-05-15 20:24:40 +00:00
|
|
|
|
C.unblur = function() {
|
Refactor progressbar & blur handling
This tries to fix a number of related issues:
* the blurred thumbnail was visible for a split-second sometimes
when switching back to an already-loaded image. (Presumably when
JS was sluggish enough to take more than 10 ms to execute.) We
now check whether the promise is pending before showing a placeholder.
(More generally, a lot of unnecessary logic was executed when paging
through already loaded images, like displaying the placeholder, so
this might make the UI a bit more responsive.)
* the blur could get stuck sometimes - I have seen this a few times,
but have never been able to reproduce it, so I'm only guessing, but
maybe the timing was really unfortunate, and we switched back less
than 10 ms before loading finished. We now remove the blur on every
branch, just to be sure.
* adding a progress handler to a promise might not have any immediate
effect, so when switching to an image which was loading, the progress
bar reacted too late. We now store the progress state per thumbnail
so it is always available immediately.
* the progress would animate from 0 to its actual state whenever we
navigated to the image. The change on paging is now instant; the
progress bar only animates when we are looking at it.
* switching quickly back and forthe between a loaded and a loading
image resulted in the loading image becoming unblurred. This seems
fixed now, I'm not sure why. Maybe the "skip on non-pending promise"
logic affects it somehow.
Also removes some unused things / renames some things which were
confusing, and makes an unrelated fix in the image provider, which kept
amassing fail handlers.
Change-Id: I580becff246f197ec1bc65e82acd422620e35578
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/489
2014-04-25 22:26:34 +00:00
|
|
|
|
// We apply empty CSS values to remove the inline styles applied by jQuery
|
|
|
|
|
// so that they don't get in the way of styles defined in CSS
|
2014-05-14 10:02:39 +00:00
|
|
|
|
this.$image.css( { '-webkit-filter' : '', 'opacity' : '', 'filter' : '' } )
|
Refactor progressbar & blur handling
This tries to fix a number of related issues:
* the blurred thumbnail was visible for a split-second sometimes
when switching back to an already-loaded image. (Presumably when
JS was sluggish enough to take more than 10 ms to execute.) We
now check whether the promise is pending before showing a placeholder.
(More generally, a lot of unnecessary logic was executed when paging
through already loaded images, like displaying the placeholder, so
this might make the UI a bit more responsive.)
* the blur could get stuck sometimes - I have seen this a few times,
but have never been able to reproduce it, so I'm only guessing, but
maybe the timing was really unfortunate, and we switched back less
than 10 ms before loading finished. We now remove the blur on every
branch, just to be sure.
* adding a progress handler to a promise might not have any immediate
effect, so when switching to an image which was loading, the progress
bar reacted too late. We now store the progress state per thumbnail
so it is always available immediately.
* the progress would animate from 0 to its actual state whenever we
navigated to the image. The change on paging is now instant; the
progress bar only animates when we are looking at it.
* switching quickly back and forthe between a loaded and a loading
image resulted in the loading image becoming unblurred. This seems
fixed now, I'm not sure why. Maybe the "skip on non-pending promise"
logic affects it somehow.
Also removes some unused things / renames some things which were
confusing, and makes an unrelated fix in the image provider, which kept
amassing fail handlers.
Change-Id: I580becff246f197ec1bc65e82acd422620e35578
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/489
2014-04-25 22:26:34 +00:00
|
|
|
|
.removeClass( 'blurred' );
|
|
|
|
|
};
|
|
|
|
|
|
2014-03-01 01:10:51 +00:00
|
|
|
|
/**
|
|
|
|
|
* Displays a message and error icon when loading the image fails.
|
|
|
|
|
* @param {string} error error message
|
|
|
|
|
*/
|
|
|
|
|
C.showError = function ( error ) {
|
|
|
|
|
this.$imageDiv.empty()
|
|
|
|
|
.addClass( 'error' )
|
|
|
|
|
.append(
|
2014-03-31 21:33:12 +00:00
|
|
|
|
$( '<div>' ).addClass( 'mw-mmv-error-text' ).text(
|
2014-03-01 01:10:51 +00:00
|
|
|
|
mw.message( 'multimediaviewer-thumbnail-error', error ).text()
|
|
|
|
|
)
|
|
|
|
|
);
|
|
|
|
|
};
|
|
|
|
|
|
2014-02-26 20:09:37 +00:00
|
|
|
|
/**
|
2014-09-26 18:37:53 +00:00
|
|
|
|
* Returns width and height of the canvas area (i.e. the space available for the image).
|
|
|
|
|
* @param {boolean} forFullscreen if true, return size in fullscreen mode; otherwise, return current size
|
|
|
|
|
* (which might still be fullscreen mode).
|
|
|
|
|
* @return {{width: Number, height: Number}} width and height in CSS pixels
|
2014-02-26 20:09:37 +00:00
|
|
|
|
*/
|
2014-09-26 18:37:53 +00:00
|
|
|
|
C.getDimensions = function ( forFullscreen ) {
|
|
|
|
|
var $window = $( window ),
|
2014-06-24 19:30:23 +00:00
|
|
|
|
$aboveFold = $( '.mw-mmv-above-fold' ),
|
2014-06-17 21:57:44 +00:00
|
|
|
|
isFullscreened = !!$aboveFold.closest( '.jq-fullscreened' ).length,
|
|
|
|
|
// Don't rely on this.$imageWrapper's sizing because it's fragile.
|
|
|
|
|
// Depending on what the wrapper contains, its size can be 0 on some browsers.
|
|
|
|
|
// Therefore, we calculate the available space manually
|
2014-05-14 10:02:39 +00:00
|
|
|
|
availableWidth = $window.width(),
|
2014-06-17 21:57:44 +00:00
|
|
|
|
availableHeight = $window.height() - ( isFullscreened ? 0 : $aboveFold.height() );
|
2014-02-26 20:09:37 +00:00
|
|
|
|
|
2014-09-26 18:37:53 +00:00
|
|
|
|
if ( forFullscreen ) {
|
|
|
|
|
return {
|
|
|
|
|
width: screen.width,
|
|
|
|
|
height: screen.height
|
|
|
|
|
};
|
|
|
|
|
} else {
|
|
|
|
|
return {
|
|
|
|
|
width: availableWidth,
|
|
|
|
|
height: availableHeight
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Gets the widths for a given lightbox image.
|
|
|
|
|
* @param {mw.mmv.LightboxImage} image
|
|
|
|
|
* @returns {mw.mmv.model.ThumbnailWidth}
|
|
|
|
|
*/
|
|
|
|
|
C.getLightboxImageWidths = function ( image ) {
|
|
|
|
|
var thumb = image.thumbnail,
|
|
|
|
|
canvasDimensions = this.getDimensions();
|
|
|
|
|
|
2014-02-26 20:09:37 +00:00
|
|
|
|
return this.thumbnailWidthCalculator.calculateWidths(
|
2014-09-26 18:37:53 +00:00
|
|
|
|
canvasDimensions.width, canvasDimensions.height, thumb.width, thumb.height );
|
2014-02-26 20:09:37 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Gets the fullscreen widths for a given lightbox image.
|
|
|
|
|
* Intended for use before the viewer is in fullscreen mode
|
|
|
|
|
* (in fullscreen mode getLightboxImageWidths() works fine).
|
|
|
|
|
* @param {mw.mmv.LightboxImage} image
|
|
|
|
|
* @returns {mw.mmv.model.ThumbnailWidth}
|
|
|
|
|
*/
|
|
|
|
|
C.getLightboxImageWidthsForFullscreen = function ( image ) {
|
2014-09-26 18:37:53 +00:00
|
|
|
|
var thumb = image.thumbnail,
|
|
|
|
|
canvasDimensions = this.getDimensions( true );
|
2014-02-26 20:09:37 +00:00
|
|
|
|
|
|
|
|
|
return this.thumbnailWidthCalculator.calculateWidths(
|
2014-09-26 18:37:53 +00:00
|
|
|
|
canvasDimensions.width, canvasDimensions.height, thumb.width, thumb.height );
|
2014-02-26 20:09:37 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Gets the widths for the current lightbox image.
|
|
|
|
|
* @returns {mw.mmv.model.ThumbnailWidth}
|
|
|
|
|
*/
|
|
|
|
|
C.getCurrentImageWidths = function () {
|
|
|
|
|
return this.getLightboxImageWidths( this.imageRawMetadata );
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
mw.mmv.ui.Canvas = Canvas;
|
|
|
|
|
}( mediaWiki, jQuery, OO ) );
|