mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer
synced 2024-11-28 18:10:06 +00:00
fec24e02f7
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
134 lines
4.6 KiB
JavaScript
134 lines
4.6 KiB
JavaScript
/*
|
|
* This file is part of the MediaWiki extension MultimediaViewer.
|
|
*
|
|
* MultimediaViewer 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.
|
|
*
|
|
* MultimediaViewer 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 MultimediaViewer. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
( function ( mw, $ ) {
|
|
|
|
/**
|
|
* Loads an image.
|
|
* @class mw.mmv.provider.Image
|
|
*/
|
|
function Image() {
|
|
/**
|
|
* @property {mw.mmv.Performance}
|
|
* @private
|
|
*/
|
|
this.performance = new mw.mmv.Performance();
|
|
|
|
/**
|
|
* AJAX call cache.
|
|
* @property {Object.<string, jQuery.Promise>} cache
|
|
* @protected
|
|
*/
|
|
this.cache = {};
|
|
}
|
|
|
|
/**
|
|
* Loads an image and returns it. Includes performance metrics via mw.mmv.Performance.
|
|
* When the browser supports it, the image is loaded as an AJAX request.
|
|
* @param {string} url
|
|
* @return {jQuery.Promise.<HTMLImageElement>} A promise which resolves to the image object.
|
|
* When loaded via AJAX, it has progress events, which return an array with the content loaded
|
|
* so far and with the progress as a floating-point number between 0 and 100.
|
|
*/
|
|
Image.prototype.get = function ( url ) {
|
|
var provider = this,
|
|
cacheKey = url,
|
|
start,
|
|
rawGet;
|
|
|
|
if ( !this.cache[cacheKey] ) {
|
|
if ( this.imagePreloadingSupported() ) {
|
|
rawGet = $.proxy( provider.rawGet, provider, url, true );
|
|
this.cache[cacheKey] = this.performance.record( 'image', url ).then( rawGet, rawGet );
|
|
} else {
|
|
start = $.now();
|
|
this.cache[cacheKey] = this.rawGet( url );
|
|
this.cache[cacheKey].always( function () {
|
|
provider.performance.recordEntry( 'image', $.now() - start, url );
|
|
} );
|
|
}
|
|
this.cache[cacheKey].fail( function ( error ) {
|
|
mw.log( provider.constructor.name + ' provider failed to load: ', error );
|
|
} );
|
|
}
|
|
|
|
return this.cache[cacheKey];
|
|
};
|
|
|
|
/**
|
|
* Internal version of get(): no caching, no performance metrics.
|
|
* @param {string} url
|
|
* @param {boolean} [cors] if true, use CORS for preloading
|
|
* @return {jQuery.Promise.<HTMLImageElement>} a promise which resolves to the image object
|
|
*/
|
|
Image.prototype.rawGet = function ( url, cors ) {
|
|
var img = new window.Image(),
|
|
deferred = $.Deferred();
|
|
|
|
// This attribute is necessary in Firefox, which needs it for the image request after
|
|
// the XHR to hit the cache by being a proper CORS request. In IE11, however,
|
|
// the presence of that attribute would cause the second image request to miss the cache,
|
|
// because IE11 adds a no-cache request header to image CORS requests. As a result,
|
|
// we call needsCrossOrigin to check if the current browser needs to set the attribute
|
|
// or not in order to avoid loading the image twice.
|
|
if ( cors && this.needsCrossOrigin() ) {
|
|
img.crossOrigin = 'anonymous';
|
|
}
|
|
|
|
img.onload = function() {
|
|
deferred.resolve( img );
|
|
};
|
|
img.onerror = function() {
|
|
deferred.reject( 'could not load image from ' + url );
|
|
};
|
|
|
|
img.src = url;
|
|
|
|
return deferred;
|
|
};
|
|
|
|
/**
|
|
* Checks whether the current browser supports AJAX preloading of images.
|
|
* This means that:
|
|
* - the browser supports CORS requests (large wiki farms usually host images on a
|
|
* separate domain) and
|
|
* - either AJAX and normal image loading uses the same cache (when an image is used by a CORS
|
|
* request, and then normally by setting img.src, it is only loaded once)
|
|
* - or (as is the case with Firefox) they are cached separately, but that can be changed by
|
|
* setting the crossOrigin attribute
|
|
* @return {boolean}
|
|
*/
|
|
Image.prototype.imagePreloadingSupported = function () {
|
|
// This checks if the browser supports CORS requests in XHRs
|
|
return window.XMLHttpRequest !== undefined && 'withCredentials' in new XMLHttpRequest();
|
|
};
|
|
|
|
/**
|
|
* Checks whether the current browser needs to set crossOrigin on images to avoid
|
|
* doing a double load
|
|
*/
|
|
Image.prototype.needsCrossOrigin = function () {
|
|
// This check is essentially "is this browser anything but IE > 10?".
|
|
// I couldn't find something more topical because IE11 does support the crossOrigin
|
|
// attribute, just in a counter-productive way compared to all the other browsers
|
|
// who also support it.
|
|
return window.MSInputMethodContext === undefined;
|
|
};
|
|
|
|
mw.mmv.provider.Image = Image;
|
|
}( mediaWiki, jQuery ) );
|