mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-22 05:06:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1286 from mkoesem/master

Browse Source 
Fix placeholderFillStyle on tiledImage has no effect #1283
This commit is contained in:
Ian Gilman 2017-08-10 10:37:09 -07:00 committed by GitHub
commit a1b27bcb33
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/tiledimage.js
View File

@ -1805,15 +1805,19 @@ function compareTiles( previousBest, tile ) {
* @param {OpenSeadragon.Tile[]} lastDrawn - An unordered list of Tiles drawn last frame. * @param {OpenSeadragon.Tile[]} lastDrawn - An unordered list of Tiles drawn last frame.
*/ */
function drawTiles( tiledImage, lastDrawn ) { function drawTiles( tiledImage, lastDrawn ) {
if (tiledImage.opacity === 0 || lastDrawn.length === 0) { if (tiledImage.opacity === 0 || (lastDrawn.length === 0 && !tiledImage.placeholderFillStyle)) {
return; return;
} }
var tile = lastDrawn[0];
var useSketch = tiledImage.opacity < 1 || var tile = lastDrawn[0];
(tiledImage.compositeOperation && var useSketch;
tiledImage.compositeOperation !== 'source-over') ||
(!tiledImage._isBottomItem() && tile._hasTransparencyChannel()); if (tile) {
useSketch = tiledImage.opacity < 1 ||
(tiledImage.compositeOperation &&
tiledImage.compositeOperation !== 'source-over') ||
(!tiledImage._isBottomItem() && tile._hasTransparencyChannel());
}
var sketchScale; var sketchScale;
var sketchTranslate; var sketchTranslate;