Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-04-26 16:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:xxorax/fabric.js

Browse source 
Conflicts:
	src/node.js
This commit is contained in:
root 2013-03-09 00:32:11 +01:00
commit 246c45d57c
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/node.js
View file

@ -146,7 +146,11 @@
var origSetWidth = fabric.StaticCanvas.prototype.setWidth;
fabric.StaticCanvas.prototype.setWidth = function(width) {
<<<<<<< HEAD
origSetWidth.call(this, width);
=======
origSetWidth.call(this, height);
>>>>>>> f84a8628c3dc7cbdaf34c4a2487fc2d6eae33277
this.nodeCanvas.width = width;
return this;
};