return this from several methods. close #111

This commit is contained in:
Anton Lavrenov 2015-12-22 17:19:33 +07:00
parent 694abb9815
commit 2a514ee580
9 changed files with 269 additions and 250 deletions

View File

@ -3,7 +3,7 @@
* Konva JavaScript Framework v0.11.0 * Konva JavaScript Framework v0.11.0
* http://konvajs.github.io/ * http://konvajs.github.io/
* Licensed under the MIT or GPL Version 2 licenses. * Licensed under the MIT or GPL Version 2 licenses.
* Date: Sun Nov 22 2015 * Date: Tue Dec 22 2015
* *
* Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS) * Original work Copyright (C) 2011 - 2013 by Eric Rowell (KineticJS)
* Modified work Copyright (C) 2014 - 2015 by Anton Lavrenov (Konva) * Modified work Copyright (C) 2014 - 2015 by Anton Lavrenov (Konva)
@ -2666,7 +2666,8 @@ var Konva = {};
* var newVal = evt.newVal; * var newVal = evt.newVal;
* }); * });
* *
* // also event delegation works * // get event targets
* // with event delegations
* layer.on('click', 'Group', function(evt) { * layer.on('click', 'Group', function(evt) {
* var shape = evt.target; * var shape = evt.target;
* var group = evtn.currentTarger; * var group = evtn.currentTarger;
@ -2763,16 +2764,20 @@ var Konva = {};
evt: evt evt: evt
}; };
this.fire(evt.type, e); this.fire(evt.type, e);
return this;
}, },
addEventListener: function(type, handler) { addEventListener: function(type, handler) {
// we have to pass native event to handler // we have to pass native event to handler
this.on(type, function(evt){ this.on(type, function(evt){
handler.call(this, evt.evt); handler.call(this, evt.evt);
}); });
return this;
}, },
removeEventListener: function(type) { removeEventListener: function(type) {
this.off(type); this.off(type);
return this;
}, },
// like node.on
_delegate: function(event, selector, handler) { _delegate: function(event, selector, handler) {
var stopNode = this; var stopNode = this;
this.on(event, function(evt) { this.on(event, function(evt) {
@ -2824,6 +2829,7 @@ var Konva = {};
Konva._removeName(this.getName(), this._id); Konva._removeName(this.getName(), this._id);
this.remove(); this.remove();
return this;
}, },
/** /**
* get attr * get attr
@ -3449,6 +3455,7 @@ var Konva = {};
} }
return res.concat(parent._findMatchers(selector, stopNode)); return res.concat(parent._findMatchers(selector, stopNode));
}, },
// is current node match passed selector?
_isMatch: function(selector) { _isMatch: function(selector) {
var selectorArr = selector.replace(/ /g, '').split(','), var selectorArr = selector.replace(/ /g, '').split(','),
len = selectorArr.length, len = selectorArr.length,
@ -3908,6 +3915,7 @@ var Konva = {};
names.splice(index, 1); names.splice(index, 1);
this.setName(names.join(' ')); this.setName(names.join(' '));
} }
return this;
}, },
/** /**
* set attr * set attr
@ -6614,6 +6622,7 @@ var Konva = {};
} }
// then destroy self // then destroy self
Konva.Node.prototype.destroy.call(this); Konva.Node.prototype.destroy.call(this);
return this;
}, },
/** /**
* return a {@link Konva.Collection} of nodes that match the selector. Use '#' for id selections * return a {@link Konva.Collection} of nodes that match the selector. Use '#' for id selections
@ -7259,6 +7268,7 @@ var Konva = {};
destroy: function() { destroy: function() {
Konva.Node.prototype.destroy.call(this); Konva.Node.prototype.destroy.call(this);
delete Konva.shapes[this.colorKey]; delete Konva.shapes[this.colorKey];
return this;
}, },
_useBufferCanvas: function(caching) { _useBufferCanvas: function(caching) {
return !caching && (this.perfectDrawEnabled() && (this.getAbsoluteOpacity() !== 1) && this.hasFill() && this.hasStroke() && this.getStage()) || return !caching && (this.perfectDrawEnabled() && (this.getAbsoluteOpacity() !== 1) && this.hasFill() && this.hasStroke() && this.getStage()) ||
@ -8708,6 +8718,7 @@ var Konva = {};
if (index > -1) { if (index > -1) {
Konva.stages.splice(index, 1); Konva.stages.splice(index, 1);
} }
return this;
}, },
/** /**
* get pointer position which can be a touch position or mouse position * get pointer position which can be a touch position or mouse position
@ -9175,7 +9186,6 @@ var Konva = {};
x = evt.clientX - contentPosition.left; x = evt.clientX - contentPosition.left;
y = evt.clientY - contentPosition.top; y = evt.clientY - contentPosition.top;
} }
if (x !== null && y !== null) { if (x !== null && y !== null) {
this.pointerPos = { this.pointerPos = {
x: x, x: x,
@ -9385,16 +9395,17 @@ var Konva = {};
stage.content.removeChild(this.getCanvas()._canvas); stage.content.removeChild(this.getCanvas()._canvas);
stage.content.appendChild(this.getCanvas()._canvas); stage.content.appendChild(this.getCanvas()._canvas);
} }
return this;
}, },
// extend Node.prototype.moveUp // extend Node.prototype.moveUp
moveUp: function() { moveUp: function() {
var moved = Konva.Node.prototype.moveUp.call(this); var moved = Konva.Node.prototype.moveUp.call(this);
if (!moved){ if (!moved){
return; return this;
} }
var stage = this.getStage(); var stage = this.getStage();
if(!stage) { if(!stage) {
return; return this;
} }
stage.content.removeChild(this.getCanvas()._canvas); stage.content.removeChild(this.getCanvas()._canvas);
@ -9403,6 +9414,7 @@ var Konva = {};
} else { } else {
stage.content.appendChild(this.getCanvas()._canvas); stage.content.appendChild(this.getCanvas()._canvas);
} }
return this;
}, },
// extend Node.prototype.moveDown // extend Node.prototype.moveDown
moveDown: function() { moveDown: function() {
@ -9414,6 +9426,7 @@ var Konva = {};
stage.content.insertBefore(this.getCanvas()._canvas, children[this.index + 1].getCanvas()._canvas); stage.content.insertBefore(this.getCanvas()._canvas, children[this.index + 1].getCanvas()._canvas);
} }
} }
return this;
}, },
// extend Node.prototype.moveToBottom // extend Node.prototype.moveToBottom
moveToBottom: function() { moveToBottom: function() {
@ -9425,6 +9438,7 @@ var Konva = {};
stage.content.insertBefore(this.getCanvas()._canvas, children[1].getCanvas()._canvas); stage.content.insertBefore(this.getCanvas()._canvas, children[1].getCanvas()._canvas);
} }
} }
return this;
}, },
getLayer: function() { getLayer: function() {
return this; return this;
@ -9444,6 +9458,7 @@ var Konva = {};
}, },
setSize: function(width, height) { setSize: function(width, height) {
this.canvas.setSize(width, height); this.canvas.setSize(width, height);
return this;
}, },
/** /**
* get/set width of layer.getter return width of stage. setter doing nothing. * get/set width of layer.getter return width of stage. setter doing nothing.
@ -9771,6 +9786,7 @@ var Konva = {};
setSize: function(width, height) { setSize: function(width, height) {
Konva.BaseLayer.prototype.setSize.call(this, width, height); Konva.BaseLayer.prototype.setSize.call(this, width, height);
this.hitCanvas.setSize(width, height); this.hitCanvas.setSize(width, height);
return this;
} }
}); });
Konva.Util.extend(Konva.Layer, Konva.BaseLayer); Konva.Util.extend(Konva.Layer, Konva.BaseLayer);
@ -10212,11 +10228,6 @@ var Konva = {};
} }
}; };
var moveTo = Konva.Node.prototype.moveTo;
Konva.Node.prototype.moveTo = function(container) {
moveTo.call(this, container);
};
/** /**
* batch draw * batch draw
* @method * @method

12
konva.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -268,11 +268,6 @@
} }
}; };
var moveTo = Konva.Node.prototype.moveTo;
Konva.Node.prototype.moveTo = function(container) {
moveTo.call(this, container);
};
/** /**
* batch draw * batch draw
* @method * @method

View File

@ -98,16 +98,17 @@
stage.content.removeChild(this.getCanvas()._canvas); stage.content.removeChild(this.getCanvas()._canvas);
stage.content.appendChild(this.getCanvas()._canvas); stage.content.appendChild(this.getCanvas()._canvas);
} }
return this;
}, },
// extend Node.prototype.moveUp // extend Node.prototype.moveUp
moveUp: function() { moveUp: function() {
var moved = Konva.Node.prototype.moveUp.call(this); var moved = Konva.Node.prototype.moveUp.call(this);
if (!moved){ if (!moved){
return; return this;
} }
var stage = this.getStage(); var stage = this.getStage();
if(!stage) { if(!stage) {
return; return this;
} }
stage.content.removeChild(this.getCanvas()._canvas); stage.content.removeChild(this.getCanvas()._canvas);
@ -116,6 +117,7 @@
} else { } else {
stage.content.appendChild(this.getCanvas()._canvas); stage.content.appendChild(this.getCanvas()._canvas);
} }
return this;
}, },
// extend Node.prototype.moveDown // extend Node.prototype.moveDown
moveDown: function() { moveDown: function() {
@ -127,6 +129,7 @@
stage.content.insertBefore(this.getCanvas()._canvas, children[this.index + 1].getCanvas()._canvas); stage.content.insertBefore(this.getCanvas()._canvas, children[this.index + 1].getCanvas()._canvas);
} }
} }
return this;
}, },
// extend Node.prototype.moveToBottom // extend Node.prototype.moveToBottom
moveToBottom: function() { moveToBottom: function() {
@ -138,6 +141,7 @@
stage.content.insertBefore(this.getCanvas()._canvas, children[1].getCanvas()._canvas); stage.content.insertBefore(this.getCanvas()._canvas, children[1].getCanvas()._canvas);
} }
} }
return this;
}, },
getLayer: function() { getLayer: function() {
return this; return this;
@ -157,6 +161,7 @@
}, },
setSize: function(width, height) { setSize: function(width, height) {
this.canvas.setSize(width, height); this.canvas.setSize(width, height);
return this;
}, },
/** /**
* get/set width of layer.getter return width of stage. setter doing nothing. * get/set width of layer.getter return width of stage. setter doing nothing.

View File

@ -141,6 +141,7 @@
} }
// then destroy self // then destroy self
Konva.Node.prototype.destroy.call(this); Konva.Node.prototype.destroy.call(this);
return this;
}, },
/** /**
* return a {@link Konva.Collection} of nodes that match the selector. Use '#' for id selections * return a {@link Konva.Collection} of nodes that match the selector. Use '#' for id selections

View File

@ -230,6 +230,7 @@
setSize: function(width, height) { setSize: function(width, height) {
Konva.BaseLayer.prototype.setSize.call(this, width, height); Konva.BaseLayer.prototype.setSize.call(this, width, height);
this.hitCanvas.setSize(width, height); this.hitCanvas.setSize(width, height);
return this;
} }
}); });
Konva.Util.extend(Konva.Layer, Konva.BaseLayer); Konva.Util.extend(Konva.Layer, Konva.BaseLayer);

View File

@ -516,15 +516,18 @@
evt: evt evt: evt
}; };
this.fire(evt.type, e); this.fire(evt.type, e);
return this;
}, },
addEventListener: function(type, handler) { addEventListener: function(type, handler) {
// we have to pass native event to handler // we have to pass native event to handler
this.on(type, function(evt){ this.on(type, function(evt){
handler.call(this, evt.evt); handler.call(this, evt.evt);
}); });
return this;
}, },
removeEventListener: function(type) { removeEventListener: function(type) {
this.off(type); this.off(type);
return this;
}, },
// like node.on // like node.on
_delegate: function(event, selector, handler) { _delegate: function(event, selector, handler) {
@ -578,6 +581,7 @@
Konva._removeName(this.getName(), this._id); Konva._removeName(this.getName(), this._id);
this.remove(); this.remove();
return this;
}, },
/** /**
* get attr * get attr
@ -1663,6 +1667,7 @@
names.splice(index, 1); names.splice(index, 1);
this.setName(names.join(' ')); this.setName(names.join(' '));
} }
return this;
}, },
/** /**
* set attr * set attr

View File

@ -171,6 +171,7 @@
destroy: function() { destroy: function() {
Konva.Node.prototype.destroy.call(this); Konva.Node.prototype.destroy.call(this);
delete Konva.shapes[this.colorKey]; delete Konva.shapes[this.colorKey];
return this;
}, },
_useBufferCanvas: function(caching) { _useBufferCanvas: function(caching) {
return !caching && (this.perfectDrawEnabled() && (this.getAbsoluteOpacity() !== 1) && this.hasFill() && this.hasStroke() && this.getStage()) || return !caching && (this.perfectDrawEnabled() && (this.getAbsoluteOpacity() !== 1) && this.hasFill() && this.hasStroke() && this.getStage()) ||

View File

@ -186,6 +186,7 @@
if (index > -1) { if (index > -1) {
Konva.stages.splice(index, 1); Konva.stages.splice(index, 1);
} }
return this;
}, },
/** /**
* get pointer position which can be a touch position or mouse position * get pointer position which can be a touch position or mouse position
@ -653,7 +654,6 @@
x = evt.clientX - contentPosition.left; x = evt.clientX - contentPosition.left;
y = evt.clientY - contentPosition.top; y = evt.clientY - contentPosition.top;
} }
if (x !== null && y !== null) { if (x !== null && y !== null) {
this.pointerPos = { this.pointerPos = {
x: x, x: x,