scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-20 22:39:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change parameter sequence in mouse event code.

Browse source
This commit is contained in:
Jürg Lehni 2011-11-16 23:47:51 +01:00
parent 9061daa935
commit cf54b1a7c1
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/ui/CanvasView.js
View file

@ -81,14 +81,14 @@ var CanvasView = View.extend(/** @lends CanvasView# */{
doubleClick,
clickTime;
function callEvent(type, point, target, event, bubble) {
function callEvent(type, event, point, target, bubble) {
var item = target,
mouseEvent,
called = false;
while (item) {
if (item.responds(type)) {
if (!mouseEvent)
mouseEvent = new MouseEvent(type, point, target, event);
mouseEvent = new MouseEvent(type, event, point, target);
called = item.fire(type, mouseEvent) || called;
if (called && (!bubble || mouseEvent._stopped))
break;
@ -106,7 +106,7 @@ var CanvasView = View.extend(/** @lends CanvasView# */{
// If we have a downItem with a mousedrag event, do not send
// mousemove events to any item while we're dragging.
if (type != 'mousemove' || !downItem)
callEvent(type, point, item, event);
callEvent(type, event, point, item);
return item;
}
}
@ -128,11 +128,11 @@ var CanvasView = View.extend(/** @lends CanvasView# */{
// If we had a mousedrag event locking mousemove events and are over
// another item, send it a mousemove event now
if (hasDrag && item != downItem)
callEvent('mousemove', point, item, event);
callEvent('mousemove', event, point, item);
if (item == downItem) {
clickTime = Date.now();
callEvent(doubleClick ? 'doubleclick' : 'click', downPoint,
overItem, event);
callEvent(doubleClick ? 'doubleclick' : 'click', event,
downPoint, overItem);
doubleClick = false;
}
downItem = null;
@ -142,12 +142,12 @@ var CanvasView = View.extend(/** @lends CanvasView# */{
_onMouseMove: function(event, point) {
// Call the mousedrag event first if an item was clicked earlier
if (downItem)
callEvent('mousedrag', point, downItem, event);
callEvent('mousedrag', event, point, downItem);
var item = handleEvent(this, 'mousemove', event, point);
if (item != overItem) {
callEvent('mouseleave', point, overItem, event);
callEvent('mouseleave', event, point, overItem);
overItem = item;
callEvent('mouseenter', point, item, event);
callEvent('mouseenter', event, point, item);
}
}
};

2
src/ui/MouseEvent.js
View file

@ -20,7 +20,7 @@
* @extends Event
*/
var MouseEvent = this.MouseEvent = Event.extend(/** @lends MouseEvent# */{
initialize: function(type, point, target, event) {
initialize: function(type, event, point, target) {
this.base(event);
this.type = type;
this.point = point;