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

Revised memento files

This commit is contained in:
Luis Leiva 2017-11-11 13:00:18 +01:00
parent 3c5e2ee4ea
commit fad61979e4
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jquery.sketchable.memento.js
View File

@ -140,7 +140,6 @@
* @memberOf MementoCanvas
*/
this.init = function() {
// Prevent subsequent instances to re-attach this event to the document.
$(document).off("keypress", keyManager);
$(document).on("keypress", keyManager);
};
@ -176,7 +175,7 @@
data.memento.reset();
data.memento.save();
},
mouseup: function(elem, data, e) {
mouseup: function(elem, data, evt) {
data.memento.save();
},
destroy: function(elem, data) {
@ -200,6 +199,7 @@
};
// Event order matters.
// Init must go first, since it's called when instantiating the plugin.
var events = 'init mouseup clear destroy'.split(" ");
for (var i = 0; i < events.length; i++) {
override(events[i]);
@ -236,7 +236,7 @@
*/
var initfn = availMethods.init;
availMethods.init = function(opts) {
return this.each(function(){
return this.each(function() {
var elem = $(this);
var conf = configure(elem, opts);
initfn.call(elem, conf);

32
sketchable.memento.js
View File

@ -6,6 +6,7 @@
globals: Event, dataBind, deepExtend.
*/
;(function(window) {
/**
* This plugin implements the <a href="https://en.wikipedia.org/wiki/Memento_pattern">Memento pattern</a>.
* This plugin automatically modifies the jSketch instances, so no need to configure it.
@ -16,11 +17,6 @@
* @example
* var mc = new MementoCanvas( $('canvas-selector') );
*/
// // TODO: Extend Sketchable class.
// MementoCanvas.prototype = new Sketchable(elem, opts);
// MementoCanvas.constructor = Sketchable;
var MementoCanvas = function(sketchable) {
// Private stuff //////////////////////////////////////////////////////////
@ -70,11 +66,11 @@
if (e.ctrlKey) {
switch (e.which) {
case 26: // Z
if (e.shiftKey) sketchable.redo();
else sketchable.undo();
if (e.shiftKey) self.redo();
else self.undo();
break;
case 25: // Y
sketchable.redo();
self.redo();
break;
default:
break;
@ -135,7 +131,6 @@
* @memberOf MementoCanvas
*/
this.init = function() {
// Prevent subsequent instances to re-attach this event to the document.
Event.remove(document, "keypress", keyManager);
Event.add(document, "keypress", keyManager);
};
@ -157,12 +152,10 @@
var defaults = Sketchable.fn.defaults;
function configure(sketchable, opts) {
var options = deepExtend(defaults, opts);
var options = deepExtend({}, defaults, opts);
// Actually this plugin is singleton, so exit early.
if (!options.interactive) return opts;
var elem = sketchable.elem;
var callbacks = {
init: function(elem, data) {
data.memento = new MementoCanvas(sketchable);
@ -173,7 +166,7 @@
data.memento.reset();
data.memento.save();
},
mouseup: function(elem, data, e) {
mouseup: function(elem, data, evt) {
data.memento.save();
},
destroy: function(elem, data) {
@ -188,8 +181,8 @@
options.events[ev] = function() {
// Exec original function first, then exec our callback.
var args = Array.prototype.slice.call(arguments, 0);
fn.apply(elem, args);
callbacks[ev].apply(elem, args);
fn.apply(sketchable, args);
callbacks[ev].apply(sketchable, args);
}
} else {
defaults.events[ev] = callbacks[ev];
@ -197,6 +190,7 @@
};
// Event order matters.
// Init must go first, since it's called when instantiating the plugin.
var events = 'init mouseup clear destroy'.split(" ");
for (var i = 0; i < events.length; i++) {
override(events[i]);
@ -222,10 +216,10 @@
};
/**
* Creates a new memento-capable jQuery.sketchable object.
* Creates a new memento-capable sketchable object.
* @param {String|Object} method name of the method to invoke,
* or a configuration object.
* @return jQuery
* @return Sketchable
* @class
* @example
* $(selector).sketchable();
@ -233,9 +227,9 @@
*/
var initfn = availMethods.init;
availMethods.init = function(opts) {
// Here `this` is a Sketchable instance.
var conf = configure(this, opts);
initfn.call(this, conf);
return this;
return initfn.call(this, conf);
};
})(this);