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

IE8 naturalWidth and naturalHeight more clear fix

Browse Source
This commit is contained in:
zakharov-aa 2016-09-28 10:39:20 +03:00 committed by GitHub
parent c5ad9b25bf
commit ffa4bbc8df
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/imagetilesource.js
View File

@ -72,13 +72,6 @@
$.TileSource.apply(this, [options]);
};
/* IE8 fix for tileSources type: 'image' */
$.getNatural = function (DOMelement) {
var img = new Image();
img.src = DOMelement.src;
return { width: img.width, height: img.height };
};
$.extend($.ImageTileSource.prototype, $.TileSource.prototype, /** @lends OpenSeadragon.ImageTileSource.prototype */{
/**
@ -121,8 +114,9 @@
}
$.addEvent(image, 'load', function () {
_this.width = $.getNatural(image).width;
_this.height = $.getNatural(image).height;
/* IE8 fix since it has no naturalWidth and naturalHeight */
_this.width = Object.prototype.hasOwnProperty.call(image, 'naturalWidth') ? image.naturalWidth : image.width;
_this.height = Object.prototype.hasOwnProperty.call(image, 'naturalHeight') ? image.naturalHeight : image.height;
_this.aspectRatio = _this.width / _this.height;
_this.dimensions = new $.Point(_this.width, _this.height);
_this._tileWidth = _this.width;
@ -209,8 +203,9 @@
_buildLevels: function () {
var levels = [{
url: this._image.src,
width: $.getNatural(this._image).width,
height: $.getNatural(this._image).height
/* IE8 fix since it has no naturalWidth and naturalHeight */
width: Object.prototype.hasOwnProperty.call(this._image, 'naturalWidth') ? this._image.naturalWidth : this._image.width,
height: Object.prototype.hasOwnProperty.call(this._image, 'naturalHeight') ? this._image.naturalHeight : this._image.height
}];
if (!this.buildPyramid || !$.supportsCanvas || !this.useCanvas) {
@ -219,8 +214,10 @@
return levels;
}
var currentWidth = this._image.naturalWidth;
var currentHeight = this._image.naturalHeight;
/* IE8 fix since it has no naturalWidth and naturalHeight */
var currentWidth = Object.prototype.hasOwnProperty.call(this._image, 'naturalWidth') ? this._image.naturalWidth : this._image.width;
var currentHeight = Object.prototype.hasOwnProperty.call(this._image, 'naturalHeight') ? this._image.naturalHeight : this._image.height;
var bigCanvas = document.createElement("canvas");
var bigContext = bigCanvas.getContext("2d");