Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-14 00:33:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

added right click fire (#3308)

Browse source
This commit is contained in:
Andrea Bogazzi 2016-10-01 20:25:47 +02:00 committed by GitHub
parent 8190aa7568
commit 89593190bb
2 changed files with 38 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/canvas.class.js
View file

@ -244,6 +244,22 @@
*/
preserveObjectStacking: false,
/**
* Indicates if the right click on canvas can output the context menu or not
* @type Boolean
* @since 1.6.5
* @default
*/
stopContextMenu: false,
/**
* Indicates if the canvas can fire right click events
* @type Boolean
* @since 1.6.5
* @default
*/
fireRightClick: false,
/**
* @private
*/

26
src/mixins/canvas_events.mixin.js
View file

@ -45,6 +45,7 @@
addListener(this.upperCanvasEl, 'mousemove', this._onMouseMove);
addListener(this.upperCanvasEl, 'mouseout', this._onMouseOut);
addListener(this.upperCanvasEl, 'wheel', this._onMouseWheel);
addListener(this.upperCanvasEl, 'contextmenu', this._onContextMenu);
// touch events
addListener(this.upperCanvasEl, 'touchstart', this._onMouseDown);
@ -74,6 +75,7 @@
this._onOrientationChange = this._onOrientationChange.bind(this);
this._onMouseWheel = this._onMouseWheel.bind(this);
this._onMouseOut = this._onMouseOut.bind(this);
this._onContextMenu = this._onContextMenu.bind(this);
},
/**
@ -86,6 +88,7 @@
removeListener(this.upperCanvasEl, 'mousemove', this._onMouseMove);
removeListener(this.upperCanvasEl, 'mouseout', this._onMouseOut);
removeListener(this.upperCanvasEl, 'wheel', this._onMouseWheel);
removeListener(this.upperCanvasEl, 'contextmenu', this._onContextMenu);
removeListener(this.upperCanvasEl, 'touchstart', this._onMouseDown);
removeListener(this.upperCanvasEl, 'touchmove', this._onMouseMove);
@ -163,6 +166,18 @@
this.__onLongPress && this.__onLongPress(e, self);
},
/**
* @private
* @param {Event} e Event object fired on mousedown
*/
_onContextMenu: function (e) {
if (this.stopContextMenu) {
e.stopPropagation()
e.preventDefault();
}
return false;
},
/**
* @private
* @param {Event} e Event object fired on mousedown
@ -423,9 +438,12 @@
*/
__onMouseDown: function (e) {
// accept only left clicks
var isLeftClick = 'which' in e ? e.which === 1 : e.button === 0;
if (!isLeftClick && !fabric.isTouchSupported) {
// if right click just fire events
var isRightClick = 'which' in e ? e.which === 3 : e.button === 2;
if (isRightClick) {
if (this.fireRightClick) {
this._handleEvent(e, 'down', target ? target : null);
}
return;
}
@ -468,7 +486,7 @@
}
}
this._handleEvent(e, 'down', target ? target : null);
// we must renderAll so that active image is placed on the top canvas
// we must renderAll so that we update the visuals
shouldRender && this.renderAll();
},