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

Few small IE fixes.

Browse source
This commit is contained in:
kangax 2011-03-29 13:27:28 -04:00
parent 9853b4a18f
commit 752eff298d
2 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
dist/all.js vendored
View file

@ -4110,21 +4110,24 @@ fabric.util.animate = animate;
* @param {Element} element
*/
_applyCanvasStyle: function (element) {
var width = this.getWidth() || element.width,
height = this.getHeight() || element.height;
fabric.util.setStyle(element, {
position: 'absolute',
width: this.getWidth() + 'px',
height: this.getHeight() + 'px',
width: width + 'px',
height: height + 'px',
left: 0,
top: 0
});
element.width = this.getWidth() || element.width;
element.height = this.getHeight() || element.height;
element.width = width;
element.height = height;
fabric.util.makeElementUnselectable(element);
},
/**
* @private
* @method initCanvas
* @method _createCanvasElement
* @param {Element} element
*/
_createCanvasElement: function() {
@ -4132,13 +4135,20 @@ fabric.util.animate = animate;
if (!element) {
throw CANVAS_INIT_ERROR;
}
if (typeof element.getContext === 'undefined' && typeof G_vmlCanvasManager !== 'undefined') {
this._initCanvasElement(element);
return element;
},
_initCanvasElement: function(element) {
if (typeof element.getContext === 'undefined' &&
typeof G_vmlCanvasManager !== 'undefined' &&
G_vmlCanvasManager.initElement) {
G_vmlCanvasManager.initElement(element);
}
if (typeof element.getContext === 'undefined') {
throw CANVAS_INIT_ERROR;
}
return element;
},
/**
@ -4185,6 +4195,7 @@ fabric.util.animate = animate;
*/
_createUpperCanvas: function (canvasEl) {
this.upperCanvasEl = fabric.util.getById(canvasEl) || this._createCanvasElement();
this._initCanvasElement(this.upperCanvasEl);
fabric.util.addClass(this.upperCanvasEl, 'upper-canvas');
this._applyCanvasStyle(this.upperCanvasEl);

25
src/element.class.js
View file

@ -284,21 +284,24 @@
* @param {Element} element
*/
_applyCanvasStyle: function (element) {
var width = this.getWidth() || element.width,
height = this.getHeight() || element.height;
fabric.util.setStyle(element, {
position: 'absolute',
width: this.getWidth() + 'px',
height: this.getHeight() + 'px',
width: width + 'px',
height: height + 'px',
left: 0,
top: 0
});
element.width = this.getWidth() || element.width;
element.height = this.getHeight() || element.height;
element.width = width;
element.height = height;
fabric.util.makeElementUnselectable(element);
},
/**
* @private
* @method initCanvas
* @method _createCanvasElement
* @param {Element} element
*/
_createCanvasElement: function() {
@ -306,13 +309,20 @@
if (!element) {
throw CANVAS_INIT_ERROR;
}
if (typeof element.getContext === 'undefined' && typeof G_vmlCanvasManager !== 'undefined') {
this._initCanvasElement(element);
return element;
},
_initCanvasElement: function(element) {
if (typeof element.getContext === 'undefined' &&
typeof G_vmlCanvasManager !== 'undefined' &&
G_vmlCanvasManager.initElement) {
G_vmlCanvasManager.initElement(element);
}
if (typeof element.getContext === 'undefined') {
throw CANVAS_INIT_ERROR;
}
return element;
},
/**
@ -359,6 +369,7 @@
*/
_createUpperCanvas: function (canvasEl) {
this.upperCanvasEl = fabric.util.getById(canvasEl) || this._createCanvasElement();
this._initCanvasElement(this.upperCanvasEl);
fabric.util.addClass(this.upperCanvasEl, 'upper-canvas');
this._applyCanvasStyle(this.upperCanvasEl);