diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index f7d95cf..50b0688 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -1716,49 +1716,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic var btneraseBrushSizeValue = $("#btnBrushSize").val(); $('#canvasPaint').sketch(); $rootScope.eraseshapeSize = parseInt(btneraseBrushSizeValue); - $.sketch.tools.marker = { - onEvent: function (e) { - switch (e.type) { - case 'mousedown': - case 'touchstart': - if (this.painting) { - this.stopPainting(); - } - this.startPainting(); - break; - case 'mouseup': - case 'mouseout': - case 'mouseleave': - case 'touchend': - case 'touchcancel': - this.stopPainting(); - } - if (this.painting) { - this.action.events.push({ - x: e.pageX - this.canvas.offset().left, - y: e.pageY - this.canvas.offset().top, - event: e.type - }); - return this.redraw(); - } - }, - draw: function (action) { - var event, previous, _i, _len, _ref; - this.context.lineJoin = "round"; - this.context.lineCap = "round"; - this.context.beginPath(); - this.context.moveTo(action.events[0].x, action.events[0].y); - _ref = action.events; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - event = _ref[_i]; - this.context.lineTo(event.x, event.y); - previous = event; - } - this.context.strokeStyle = action.color; - this.context.lineWidth = action.size; - return this.context.stroke(); - } - }; + $("#annotationpainteraser").attr("data-size", $rootScope.eraseshapeSize); return $.sketch.tools.eraser = { onEvent: function (e) { diff --git a/400-SOURCECODE/AIAHTML5.Web/libs/sketch.js b/400-SOURCECODE/AIAHTML5.Web/libs/sketch.js index 1f5c62f..4cd8aea 100644 --- a/400-SOURCECODE/AIAHTML5.Web/libs/sketch.js +++ b/400-SOURCECODE/AIAHTML5.Web/libs/sketch.js @@ -127,7 +127,10 @@ var __slice = Array.prototype.slice; onEvent: function(e) { switch (e.type) { case 'mousedown': - case 'touchstart': + case 'touchstart': + if (this.painting) { + this.stopPainting(); + } this.startPainting(); break; case 'mouseup':