Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/right click #92

Merged
merged 16 commits into from
Oct 23, 2019
Merged

Feat/right click #92

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
87ccd76
pass in mouse event through UIs
tibotiber Oct 17, 2019
65d82a3
uniform variable names
tibotiber Oct 17, 2019
2f90b45
build
tibotiber Oct 17, 2019
ead3a3b
build docs
tibotiber Oct 17, 2019
564f286
typings and minify
tibotiber Oct 17, 2019
4c653c5
backward compatible api
tibotiber Oct 17, 2019
8edce52
build
tibotiber Oct 17, 2019
f12a315
update docs
tibotiber Oct 17, 2019
592bdea
typings and minify again
tibotiber Oct 17, 2019
74ed8da
Revert "typings and minify again"
tibotiber Oct 22, 2019
f91cdf4
Revert "update docs"
tibotiber Oct 22, 2019
30b20c7
Revert "build"
tibotiber Oct 22, 2019
2e2269d
Revert "typings and minify"
tibotiber Oct 22, 2019
9fb0ea9
Revert "build docs"
tibotiber Oct 22, 2019
88a0d67
Revert "build"
tibotiber Oct 22, 2019
1868541
build
tibotiber Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
uniform variable names
  • Loading branch information
@tibotiber
tibotiber committed Oct 17, 2019
commit 65d82a314dd4cf111e43689e72f5419eb1b76489
38 changes: 19 additions & 19 deletions src/UI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class UI {

protected static _counter:number = 0;
protected _id:string;
protected _actions: {[key:string]: UIHandler[] };
protected _actions: {[type:string]: UIHandler[] };
protected _states: {[key:string]: any};

protected _holds = new Map<number, string>();
Expand Down Expand Up @@ -135,29 +135,29 @@ export class UI {

/**
* Add an event handler. Remember this UI will also need to be tracked for events via `UI.track`.
* @param key event key
* @param type event type
* @param fn a [`UIHandler`](#link) callback function: `fn( target:UI, pt:Pt, type:string )`
* @returns an id number that reference to this handler, for use in [`UI.off`](#link)
*/
on( key:string, fn:UIHandler ):number {
if (!this._actions[key]) this._actions[key] = [];
return UI._addHandler( this._actions[key], fn );
on( type:string, fn:UIHandler ):number {
if (!this._actions[type]) this._actions[type] = [];
return UI._addHandler( this._actions[type], fn );
}


/**
* Remove an event handler.
* @param key event key
* @param which an ID number returned by [`UI.on`](#link). If this is not defined, all handlers in this key will be removed.
* @param type event type
* @param which an ID number returned by [`UI.on`](#link). If this is not defined, all handlers in this type will be removed.
* @param fn a [`UIHandler`](#link) function: `fn( target:UI, pt:Pt, type:string )`
*/
off( key:string, which?:number ):boolean {
if (!this._actions[key]) return false;
off( type:string, which?:number ):boolean {
if (!this._actions[type]) return false;
if (which === undefined) {
delete this._actions[key];
delete this._actions[type];
return true;
} else {
return UI._removeHandler( this._actions[key], which );
return UI._removeHandler( this._actions[type], which );
}
}

Expand Down Expand Up @@ -185,11 +185,11 @@ export class UI {

/**
* Continue to keep track of an actions even if it's not within this UI. Useful for hover-leave and drag-outside.
* @param event a string defined in [`UIPointerActions`](#link)
* @param type a string defined in [`UIPointerActions`](#link)
*/
protected hold( event:string ):number {
protected hold( type:string ):number {
let newKey = Math.max(0, ...Array.from(this._holds.keys())) + 1;
this._holds.set(newKey, event);
this._holds.set(newKey, type);
return newKey;
}

Expand Down Expand Up @@ -367,7 +367,7 @@ export class UIButton extends UI {

/**
* Remove an existing click handler
* @param id an ID number returned by [`UIButton.onClick`](#link). If this is not defined, all handlers in this key will be removed.
* @param id an ID number returned by [`UIButton.onClick`](#link). If this is not defined, all handlers in this type will be removed.
* @returns a boolean indicating whether the handler was removed successfully
*/
offClick( id:number ):boolean {
Expand All @@ -391,8 +391,8 @@ export class UIButton extends UI {

/**
* Remove handlers for hover events.
* @param enterID an ID number returned by [`UI.onClick`](#link), or -1 to skip. If this is not defined, all handlers in this key will be removed.
* @param leaveID an ID number returned by [`UI.onClick`](#link), or -1 to skip. If this is not defined, all handlers in this key will be removed.
* @param enterID an ID number returned by [`UI.onClick`](#link), or -1 to skip. If this is not defined, all handlers in this type will be removed.
* @param leaveID an ID number returned by [`UI.onClick`](#link), or -1 to skip. If this is not defined, all handlers in this type will be removed.
* @returns an array of booleans indicating whether the handlers were removed successfully
*/
offHover( enterID?:number, leaveID?:number ):boolean[] {
Expand Down Expand Up @@ -500,7 +500,7 @@ export class UIDragger extends UIButton {

/**
* Remove an existing drag handler
* @param id an ID number returned by [`UIDragger.onDrag`](#link). If this is not defined, all handlers in this key will be removed.
* @param id an ID number returned by [`UIDragger.onDrag`](#link). If this is not defined, all handlers in this type will be removed.
* @returns a boolean indicating whether the handler was removed successfully
*/
offDrag( id:number ):boolean {
Expand All @@ -520,7 +520,7 @@ export class UIDragger extends UIButton {

/**
* Remove an existing drop handler
* @param id an ID number returned by [`UIDragger.onDrag`](#link). If this is not defined, all handlers in this key will be removed.
* @param id an ID number returned by [`UIDragger.onDrag`](#link). If this is not defined, all handlers in this type will be removed.
* @returns a boolean indicating whether the handler was removed successfully
*/
offDrop( id:number ):boolean {
Expand Down