From ad1fc2ecc2bef97029728fdead55e835c05edd4f Mon Sep 17 00:00:00 2001 From: juliandescottes Date: Mon, 3 Sep 2012 22:22:24 +0200 Subject: [PATCH] Eraser now inherits from SimplePen. Added a superclass property attached in the inherit util --- js/drawingtools/Eraser.js | 17 ++--------------- js/utils.js | 2 ++ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/js/drawingtools/Eraser.js b/js/drawingtools/Eraser.js index 51ebebc1..5d70f41a 100644 --- a/js/drawingtools/Eraser.js +++ b/js/drawingtools/Eraser.js @@ -11,25 +11,12 @@ this.toolId = "tool-eraser"; }; - pskl.utils.inherit(ns.Eraser, ns.BaseTool); + pskl.utils.inherit(ns.Eraser, ns.SimplePen); /** * @override */ ns.Eraser.prototype.applyToolAt = function(col, row, frame, color, canvas, dpi) { - - // Change model: - frame[col][row] = Constants.TRANSPARENT_COLOR; - - // Draw on canvas: - // TODO: Remove that when we have the centralized redraw loop - this.drawPixelInCanvas(col, row, canvas, Constants.TRANSPARENT_COLOR, dpi); - }; - - /** - * @override - */ - ns.Eraser.prototype.moveToolAt = function(col, row, frame, color, canvas, dpi) { - this.applyToolAt(col, row, frame, color, canvas, dpi); + this.superclass.applyToolAt.call(this, col, row, frame, Constants.TRANSPARENT_COLOR, canvas, dpi); }; })(); \ No newline at end of file diff --git a/js/utils.js b/js/utils.js index 42cbbeb6..d5e6fba6 100644 --- a/js/utils.js +++ b/js/utils.js @@ -37,6 +37,8 @@ jQuery.namespace = function() { ns.inherit = function(extendedObject, inheritFrom) { extendedObject.prototype = Object.create(inheritFrom.prototype); extendedObject.prototype.constructor = extendedObject; + extendedObject.prototype.superclass = inheritFrom.prototype; + //pskl.ToolBehavior.Eraser.prototype = Object.create(pskl.ToolBehavior.BaseTool.prototype); //prototypeskl.ToolBehavior.Eraser.prototype.constructor = pskl.ToolBehavior.Eraser; };