Skip to content

Commit

Permalink
Update clear methd (#3305)
Browse files Browse the repository at this point in the history
* Update  clear method
  • Loading branch information
asturur authored Oct 1, 2016
1 parent e0f6872 commit 43813ad
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
4 changes: 4 additions & 0 deletions src/static_canvas.class.js
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,10 @@
*/
clear: function () {
this._objects.length = 0;
this.backgroundImage = null;
this.overlayImage = null;
this.backgroundColor = '';
this.overlayColor = ''
this.clearContext(this.contextContainer);
this.fire('canvas:cleared');
this.renderAll();
Expand Down
12 changes: 10 additions & 2 deletions test/unit/canvas_static.js
Original file line number Diff line number Diff line change
Expand Up @@ -434,9 +434,17 @@

test('clear', function() {
ok(typeof canvas.clear == 'function');

var bg = new fabric.Rect({ width: 10, height: 20 });
canvas.backgroundColor = '#FF0000';
canvas.overlayColor = '#FF0000';
canvas.backgroundImage = bg;
canvas.overlayImage = bg;
equal(canvas.clear(), canvas, 'should be chainable');
equal(canvas.getObjects().length, 0);
equal(canvas.getObjects().length, 0, 'clear remove all objects');
equal(canvas.backgroundColor, '', 'clear remove background color');
equal(canvas.overlayColor, '', 'clear remove overlay color');
equal(canvas.backgroundImage, null, 'clear remove bg image');
equal(canvas.overlayImage, null, 'clear remove overlay image');
});

test('renderAll', function() {
Expand Down

0 comments on commit 43813ad

Please sign in to comment.