Fixed even handlers

jquery.sketchable.js

@@ -161,9 +161,9 @@
           elem.unbind("mouseup", mouseupHandler);
           elem.unbind("mousemove", mousemoveHandler);
           elem.unbind("mousedown", mousedownHandler);
-          elem.unbind("touchstart", touchHandler);
-          elem.unbind("touchmove", touchHandler);
-          elem.unbind("touchend", touchHandler);
+          elem.unbind("touchstart", touchdownHandler);
+          elem.unbind("touchmove", touchmoveHandler);
+          elem.unbind("touchend", touchupHandler);
         }
         elem.removeData(_ns);
 

jquery.sketchable.memento.js

@@ -90,6 +90,7 @@
     this.undo = function() {
       prev();
       $canvas.sketchable('handler', function(elem, data) {
+        if (stack[stpos])
           data.strokes = stack[stpos].strokes.slice();
       });
     };
@@ -101,6 +102,7 @@
     this.redo = function() {
       next();
       $canvas.sketchable('handler', function(elem, data) {
+        if (stack[stpos])
           data.strokes = stack[stpos].strokes.slice();
       });
     };

jquery.sketchable.memento.min.js

@@ -1,4 +1 @@
-/*!
- * Memento plugin for jQuery sketchable | v1.1 | Luis A. Leiva | MIT license
- */
-(function(e){var a=function(m){var h=[];var g=-1;var i=this;function l(){if(g>0){g--;var o=new Image();o.src=h[g].image;o.onload=function(){j(this)}}}function k(){if(g<h.length-1){g++;var o=new Image();o.src=h[g].image;o.onload=function(){j(this)}}}function j(o){m.sketchable("handler",function(p,q){q.sketch.clear();q.sketch.graphics.drawImage(o,0,0)})}function n(o){if(o.ctrlKey){switch(o.which){case 26:if(o.shiftKey){i.redo()}else{i.undo()}break;case 25:i.redo();break;default:break}}}this.undo=function(){l();m.sketchable("handler",function(o,p){p.strokes=h[g].strokes.slice()})};this.redo=function(){k();m.sketchable("handler",function(o,p){p.strokes=h[g].strokes.slice()})};this.reset=function(){h=[];g=-1};this.save=function(){g++;if(g<h.length){h.length=g}m.sketchable("handler",function(o,p){h.push({image:o[0].toDataURL(),strokes:p.strokes.slice()})})};this.init=function(){e(document).off("keypress",n);e(document).on("keypress",n)};this.destroy=function(){e(document).off("keypress",n);this.reset()}};var d=e.fn.sketchable;var f=d("methods");function c(j,g){var o=j,p=e.extend(true,d.defaults,g);if(!p.interactive){return g}var m=new a(j);var l={init:function(i,q){q.memento=m;q.memento.save();q.memento.init()},mouseup:function(i,q,r){q.memento.save()},destroy:function(i,q){q.memento.destroy()}};function h(q){if(p&&p.events&&typeof p.events[q]==="function"){var i=p.events[q];p.events[q]=function(){var r=Array.prototype.slice.call(arguments,0);i.apply(o,r);l[q].apply(o,r)}}else{d.defaults.events[q]=l[q]}}if(!d.isMementoReady){var n="init mouseup destroy".split(" ");for(var k=0;k<n.length;k++){h(n[k])}d.isMementoReady=true}e.extend(f,{undo:function(){m.undo()},redo:function(){m.redo()}});return d.defaults}var b=f.init;f.init=function(h){var g=c(this,h);return b.call(this,g)}})(jQuery);
+(function($){var MementoCanvas=function($canvas){var stack=[];var stpos=-1;var self=this;function prev(){if(stpos>0){stpos--;var snapshot=new Image;snapshot.src=stack[stpos].image;snapshot.onload=function(){restore(this)}}}function next(){if(stpos<stack.length-1){stpos++;var snapshot=new Image;snapshot.src=stack[stpos].image;snapshot.onload=function(){restore(this)}}}function restore(snapshot){$canvas.sketchable("handler",function(elem,data){data.sketch.clear();data.sketch.graphics.drawImage(snapshot,0,0)})}function keyManager(e){if(e.ctrlKey){switch(e.which){case 26:if(e.shiftKey)self.redo();else self.undo();break;case 25:self.redo();break;default:break}}}this.undo=function(){prev();$canvas.sketchable("handler",function(elem,data){if(stack[stpos])data.strokes=stack[stpos].strokes.slice()})};this.redo=function(){next();$canvas.sketchable("handler",function(elem,data){if(stack[stpos])data.strokes=stack[stpos].strokes.slice()})};this.reset=function(){stack=[];stpos=-1};this.save=function(){stpos++;if(stpos<stack.length)stack.length=stpos;$canvas.sketchable("handler",function(elem,data){stack.push({image:elem[0].toDataURL(),strokes:data.strokes.slice()})})};this.init=function(){$(document).off("keypress",keyManager);$(document).on("keypress",keyManager)};this.destroy=function(){$(document).off("keypress",keyManager);this.reset()}};var plugin=$.fn.sketchable;var availMethods=plugin("methods");function configure(elem,opts){var self=elem,options=$.extend(true,plugin.defaults,opts);if(!options.interactive)return opts;var mc=new MementoCanvas(elem);var callbacks={init:function(elem,data){data.memento=mc;data.memento.save();data.memento.init()},mouseup:function(elem,data,e){data.memento.save()},destroy:function(elem,data){data.memento.destroy()}};function override(ev){if(options&&options.events&&typeof options.events[ev]==="function"){var fn=options.events[ev];options.events[ev]=function(){var args=Array.prototype.slice.call(arguments,0);fn.apply(self,args);callbacks[ev].apply(self,args)}}else{plugin.defaults.events[ev]=callbacks[ev]}}if(!plugin.isMementoReady){var events="init mouseup destroy".split(" ");for(var i=0;i<events.length;i++){override(events[i])}plugin.isMementoReady=true}$.extend(availMethods,{undo:function(){mc.undo()},redo:function(){mc.redo()}});return plugin.defaults}var initfn=availMethods.init;availMethods.init=function(opts){var conf=configure(this,opts);return initfn.call(this,conf)}})(jQuery);