Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-04-08 00:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add "mouse:over" and "mouse:out" events

Browse source
This commit is contained in:
kangax 2013-12-09 15:35:08 +01:00
parent 423bfd9f3b
commit 8d8cd16f6c
5 changed files with 112 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
dist/all.js vendored
View file

@ -170,12 +170,12 @@ fabric.Collection = {
/**
* Adds objects to collection, then renders canvas (if `renderOnAddRemove` is not `false`)
* Objects should be instances of (or inherit from) fabric.Object
* @param [...] Zero or more fabric instances
* @param {...fabric.Object} object Zero or more fabric instances
* @return {Self} thisArg
*/
add: function () {
this._objects.push.apply(this._objects, arguments);
for (var i = arguments.length; i--; ) {
for (var i = 0, length = arguments.length; i < length; i++) {
this._onObjectAdded(arguments[i]);
}
this.renderOnAddRemove && this.renderAll();
@ -189,6 +189,7 @@ fabric.Collection = {
* @param {Number} index Index to insert object at
* @param {Boolean} nonSplicing When `true`, no splicing (shifting) of objects occurs
* @return {Self} thisArg
* @chainable
*/
insertAt: function (object, index, nonSplicing) {
var objects = this.getObjects();
@ -204,22 +205,27 @@ fabric.Collection = {
},
/**
* Removes an object from a collection, then renders canvas (if `renderOnAddRemove` is not `false`)
* @param {Object} object Object to remove
* Removes objects from a collection, then renders canvas (if `renderOnAddRemove` is not `false`)
* @param {...fabric.Object} object Zero or more fabric instances
* @return {Self} thisArg
* @chainable
*/
remove: function(object) {
remove: function() {
var objects = this.getObjects(),
index = objects.indexOf(object);
index;
// only call onObjectRemoved if an object was actually removed
if (index !== -1) {
objects.splice(index, 1);
this._onObjectRemoved(object);
for (var i = 0, length = arguments.length; i < length; i++) {
index = objects.indexOf(arguments[i]);
// only call onObjectRemoved if an object was actually removed
if (index !== -1) {
objects.splice(index, 1);
this._onObjectRemoved(arguments[i]);
}
}
this.renderOnAddRemove && this.renderAll();
return object;
return this;
},
/**
@ -7196,6 +7202,8 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
* @fires mouse:down
* @fires mouse:move
* @fires mouse:up
* @fires mouse:over
* @fires mouse:out
*
*/
fabric.Canvas = fabric.util.createClass(fabric.StaticCanvas, /** @lends fabric.Canvas.prototype */ {
@ -7899,7 +7907,31 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
return activeGroup;
}
return this._searchPossibleTargets(e);
var target = this._searchPossibleTargets(e);
this._fireOverOutEvents(target);
return target;
},
/**
* @private
*/
_fireOverOutEvents: function(target) {
if (target) {
if (this._hoveredTarget !== target) {
this.fire('mouse:over', { target: target });
target.fire('mouseover');
if (this._hoveredTarget) {
this.fire('mouse:out', { target: this._hoveredTarget });
this._hoveredTarget.fire('mouseout');
}
this._hoveredTarget = target;
}
}
else if (this._hoveredTarget) {
this.fire('mouse:out', { target: this._hoveredTarget });
this._hoveredTarget.fire('mouseout');
this._hoveredTarget = null;
}
},
/**
@ -10910,7 +10942,8 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @lends fabric.Stati
* @chainable
*/
remove: function() {
return this.canvas.remove(this);
this.canvas.remove(this);
return this;
},
/**

14
dist/all.min.js vendored
View file

File diff suppressed because one or more lines are too long

BIN
dist/all.min.js.gz vendored
View file

Binary file not shown.

59
dist/all.require.js vendored
View file

@ -170,12 +170,12 @@ fabric.Collection = {
/**
* Adds objects to collection, then renders canvas (if `renderOnAddRemove` is not `false`)
* Objects should be instances of (or inherit from) fabric.Object
* @param [...] Zero or more fabric instances
* @param {...fabric.Object} object Zero or more fabric instances
* @return {Self} thisArg
*/
add: function () {
this._objects.push.apply(this._objects, arguments);
for (var i = arguments.length; i--; ) {
for (var i = 0, length = arguments.length; i < length; i++) {
this._onObjectAdded(arguments[i]);
}
this.renderOnAddRemove && this.renderAll();
@ -189,6 +189,7 @@ fabric.Collection = {
* @param {Number} index Index to insert object at
* @param {Boolean} nonSplicing When `true`, no splicing (shifting) of objects occurs
* @return {Self} thisArg
* @chainable
*/
insertAt: function (object, index, nonSplicing) {
var objects = this.getObjects();
@ -204,22 +205,27 @@ fabric.Collection = {
},
/**
* Removes an object from a collection, then renders canvas (if `renderOnAddRemove` is not `false`)
* @param {Object} object Object to remove
* Removes objects from a collection, then renders canvas (if `renderOnAddRemove` is not `false`)
* @param {...fabric.Object} object Zero or more fabric instances
* @return {Self} thisArg
* @chainable
*/
remove: function(object) {
remove: function() {
var objects = this.getObjects(),
index = objects.indexOf(object);
index;
// only call onObjectRemoved if an object was actually removed
if (index !== -1) {
objects.splice(index, 1);
this._onObjectRemoved(object);
for (var i = 0, length = arguments.length; i < length; i++) {
index = objects.indexOf(arguments[i]);
// only call onObjectRemoved if an object was actually removed
if (index !== -1) {
objects.splice(index, 1);
this._onObjectRemoved(arguments[i]);
}
}
this.renderOnAddRemove && this.renderAll();
return object;
return this;
},
/**
@ -7196,6 +7202,8 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
* @fires mouse:down
* @fires mouse:move
* @fires mouse:up
* @fires mouse:over
* @fires mouse:out
*
*/
fabric.Canvas = fabric.util.createClass(fabric.StaticCanvas, /** @lends fabric.Canvas.prototype */ {
@ -7899,7 +7907,31 @@ fabric.PatternBrush = fabric.util.createClass(fabric.PencilBrush, /** @lends fab
return activeGroup;
}
return this._searchPossibleTargets(e);
var target = this._searchPossibleTargets(e);
this._fireOverOutEvents(target);
return target;
},
/**
* @private
*/
_fireOverOutEvents: function(target) {
if (target) {
if (this._hoveredTarget !== target) {
this.fire('mouse:over', { target: target });
target.fire('mouseover');
if (this._hoveredTarget) {
this.fire('mouse:out', { target: this._hoveredTarget });
this._hoveredTarget.fire('mouseout');
}
this._hoveredTarget = target;
}
}
else if (this._hoveredTarget) {
this.fire('mouse:out', { target: this._hoveredTarget });
this._hoveredTarget.fire('mouseout');
this._hoveredTarget = null;
}
},
/**
@ -10910,7 +10942,8 @@ fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @lends fabric.Stati
* @chainable
*/
remove: function() {
return this.canvas.remove(this);
this.canvas.remove(this);
return this;
},
/**

17
src/canvas.class.js
View file

@ -29,6 +29,8 @@
* @fires mouse:down
* @fires mouse:move
* @fires mouse:up
* @fires mouse:over
* @fires mouse:out
*
*/
fabric.Canvas = fabric.util.createClass(fabric.StaticCanvas, /** @lends fabric.Canvas.prototype */ {
@ -733,23 +735,30 @@
}
var target = this._searchPossibleTargets(e);
this._fireOverOutEvents(target);
return target;
},
/**
* @private
*/
_fireOverOutEvents: function(target) {
if (target) {
if (this._hoveredTarget !== target) {
this.fire('object:over', { target: target });
this.fire('mouse:over', { target: target });
target.fire('mouseover');
if (this._hoveredTarget) {
this.fire('object:out', { target: this._hoveredTarget });
this.fire('mouse:out', { target: this._hoveredTarget });
this._hoveredTarget.fire('mouseout');
}
this._hoveredTarget = target;
}
}
else if (this._hoveredTarget) {
this.fire('object:out', { target: this._hoveredTarget });
this.fire('mouse:out', { target: this._hoveredTarget });
this._hoveredTarget.fire('mouseout');
this._hoveredTarget = null;
}
return target;
},
/**