happyz
/
jsketch
mirror of https://github.com/luileito/jsketch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed memento plugin to work in multiple sketchable instances

This commit is contained in:
Luis A. Leiva 2015-11-09 11:36:44 +01:00
parent ed9eb33b22
commit 742eda7843
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
jquery.sketchable.memento.js
View File

@ -55,6 +55,9 @@
// Manipulate canvas via jQuery sketchable API. // Manipulate canvas via jQuery sketchable API.
// This way, we don't lose default drawing settings et al. // This way, we don't lose default drawing settings et al.
$canvas.sketchable('handler', function(elem, data){ $canvas.sketchable('handler', function(elem, data){
//data.sketch.clear().drawImage(snapshot.src);
// Note: jSketch.drawImage after clear creates some flickering,
// so use the native HTMLCanvasElement.drawImage method instead.
data.sketch.clear(); data.sketch.clear();
data.sketch.graphics.drawImage(snapshot, 0,0); data.sketch.graphics.drawImage(snapshot, 0,0);
}); });
@ -150,19 +153,18 @@
}; };
// Bind plugin extension //////////////////////////////////////////////////// // Bind plugin extension ////////////////////////////////////////////////////
var namespace = "sketchable";
var plugin = $.fn.sketchable; var plugin = $.fn.sketchable;
var availMethods = plugin('methods'); var availMethods = plugin('methods');
function configure(elem, opts) { function configure(elem, opts) {
var self = elem, options = $.extend(true, plugin.defaults, opts); var options = $.extend(true, {}, plugin.defaults, opts);
// Actually this plugin is singleton, so exit early. // Actually this plugin is singleton, so exit early.
if (!options.interactive) return opts; if (!options.interactive) return opts;
var mc = new MementoCanvas(elem);
var callbacks = { var callbacks = {
init: function(elem, data) { init: function(elem, data) {
data.memento = mc; data.memento = new MementoCanvas(elem);
data.memento.save(); data.memento.save();
data.memento.init(); data.memento.init();
}, },
@ -184,8 +186,8 @@
options.events[ev] = function() { options.events[ev] = function() {
// Exec original function first, then exec our callback. // Exec original function first, then exec our callback.
var args = Array.prototype.slice.call(arguments, 0); var args = Array.prototype.slice.call(arguments, 0);
fn.apply(self, args); fn.apply(elem, args);
callbacks[ev].apply(self, args); callbacks[ev].apply(elem, args);
} }
} else { } else {
plugin.defaults.events[ev] = callbacks[ev]; plugin.defaults.events[ev] = callbacks[ev];
@ -205,10 +207,12 @@
// Expose public API for jquery.sketchable plugin. // Expose public API for jquery.sketchable plugin.
$.extend(availMethods, { $.extend(availMethods, {
undo: function() { undo: function() {
mc.undo(); var elem = $(this), data = elem.data(namespace);
data.memento.undo();
}, },
redo: function() { redo: function() {
mc.redo(); var elem = $(this), data = elem.data(namespace);
data.memento.redo();
} }
}); });
@ -227,8 +231,11 @@
*/ */
var initfn = availMethods.init; var initfn = availMethods.init;
availMethods.init = function(opts) { availMethods.init = function(opts) {
var conf = configure(this, opts); return this.each(function(){
return initfn.call(this, conf); var elem = $(this);
var conf = configure(elem, opts);
initfn.call(elem, conf);
});
}; };
})(jQuery); })(jQuery);