Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-03 11:34:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

naturalWidth and naturalHeight (#5178)

Browse source 
* naturalWidth and naturalHeight

* fixed test
This commit is contained in:
Andrea Bogazzi 2018-08-19 22:03:14 +02:00 committed by GitHub
parent 56fefbdb0d
commit e8a5ad446b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/shapes/image.class.js
View file

@ -144,7 +144,7 @@
* @return {HTMLImageElement} Image element
*/
getElement: function() {
return this._element;
return this._element || {};
},
/**
@ -213,8 +213,8 @@
getOriginalSize: function() {
var element = this.getElement();
return {
width: element.width,
height: element.height
width: element.naturalWidth || element.width,
height: element.naturalHeight || element.height
};
},
@ -519,10 +519,7 @@
* @private
*/
_resetWidthHeight: function() {
var element = this.getElement();
this.set('width', element.width);
this.set('height', element.height);
this.set(this.getOriginalSize());
},
/**
@ -568,20 +565,15 @@
/**
* @private
* Set the width and the height of the image object, using the element or the
* options.
* @param {Object} [options] Object with width/height properties
*/
_setWidthHeight: function(options) {
this.width = options && ('width' in options)
? options.width
: (this.getElement()
? this.getElement().width || 0
: 0);
this.height = options && ('height' in options)
? options.height
: (this.getElement()
? this.getElement().height || 0
: 0);
options || (options = { });
var el = this.getElement();
this.width = options.width || el.naturalWidth || el.width || 0;
this.height = options.height || el.naturalHeight || el.height || 0;
},
/**

12
test/unit/image.js
View file

@ -73,16 +73,12 @@
}
function _createImageObject(width, height, callback, options) {
options = options || {};
var elImage = _createImageElement();
setSrc(elImage, IMG_SRC, function() {
if (width !== elImage.width || height !== elImage.height) {
elImage.width = width;
elImage.height = height;
callback(new fabric.Image(elImage, options));
}
else {
callback(new fabric.Image(elImage, options));
}
options.width = width;
options.height = height;
callback(new fabric.Image(elImage, options));
});
}