scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-06 04:42:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove recently introduced code blocks for small conditional statements.

Browse source
This commit is contained in:
Jürg Lehni 2011-05-15 17:59:37 +01:00
parent 40c988b313
commit 6e0e31480a
1 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/tool/ToolHandler.js
View file

@ -25,9 +25,8 @@ var ToolHandler = this.ToolHandler = Base.extend({
this._firstMove = true;
this._count = 0;
this._downCount = 0;
for (var i in handlers) {
for (var i in handlers)
this[i] = handlers[i];
}
},
/**
@ -59,10 +58,8 @@ var ToolHandler = this.ToolHandler = Base.extend({
},
getFixedDistance: function() {
if (this._minDistance == this._maxDistance) {
return this._minDistance;
}
return null;
return this._minDistance == this._maxDistance
? this._minDistance : null;
},
setFixedDistance: function(distance) {
@ -77,9 +74,8 @@ var ToolHandler = this.ToolHandler = Base.extend({
var minDist = minDistance != null ? minDistance : 0;
var vector = pt.subtract(this._point);
var distance = vector.getLength();
if (distance < minDist) {
if (distance < minDist)
return false;
}
// Produce a new point on the way to pt if pt is further away
// than maxDistance
var maxDist = maxDistance != null ? maxDistance : 0;
@ -91,9 +87,8 @@ var ToolHandler = this.ToolHandler = Base.extend({
}
}
}
if (needsChange && pt.equals(this._point)) {
if (needsChange && pt.equals(this._point))
return false;
}
}
this._lastPoint = this._point;
this._point = pt;
@ -118,9 +113,8 @@ var ToolHandler = this.ToolHandler = Base.extend({
switch (type) {
case 'mousedown':
this.updateEvent(type, pt, null, null, true, false, false);
if (this.onMouseDown) {
if (this.onMouseDown)
this.onMouseDown(new ToolEvent(this, type, event));
}
break;
case 'mousedrag':
// In order for idleInterval drag events to work, we need to not
@ -135,9 +129,8 @@ var ToolHandler = this.ToolHandler = Base.extend({
matchMaxDistance = false;
while (this.updateEvent(type, pt, this.minDistance,
this.maxDistance, false, needsChange, matchMaxDistance)) {
if (this.onMouseDrag) {
if (this.onMouseDrag)
this.onMouseDrag(new ToolEvent(this, type, event));
}
needsChange = true;
matchMaxDistance = true;
}
@ -148,15 +141,13 @@ var ToolHandler = this.ToolHandler = Base.extend({
if ((this._point.x != pt.x || this._point.y != pt.y)
&& this.updateEvent('mousedrag', pt, this.minDistance,
this.maxDistance, false, false, false)) {
if (this.onMouseDrag) {
if (this.onMouseDrag)
this.onMouseDrag(new ToolEvent(this, type, event));
}
}
this.updateEvent(type, pt, null, this.maxDistance, false,
false, false);
if (this.onMouseUp) {
if (this.onMouseUp)
this.onMouseUp(new ToolEvent(this, type, event));
}
// Start with new values for 'mousemove'
this.updateEvent(type, pt, null, null, true, false, false);
this._firstMove = true;
@ -164,9 +155,8 @@ var ToolHandler = this.ToolHandler = Base.extend({
case 'mousemove':
while (this.updateEvent(type, pt, this.minDistance,
this.maxDistance, this._firstMove, true, false)) {
if (this.onMouseMove) {
if (this.onMouseMove)
this.onMouseMove(new ToolEvent(this, type, event));
}
this._firstMove = false;
}
break;