Skip to content

Commit

Permalink
Remove the reset of the prefixe private variables
Browse files Browse the repository at this point in the history
Change the import name to work the the default tslint file
  • Loading branch information
larsvanbraam committed Oct 12, 2017
1 parent 1e7f4c2 commit 9a15290
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 16 deletions.
11 changes: 2 additions & 9 deletions src/lib/AbstractEvent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ abstract class AbstractEvent implements IEvent {
/**
* _true_ if [[cancelable]] is true and [[preventDefault]] has been called on this event.
*/
private _defaultPrevented: boolean = false;
public defaultPrevented: boolean = false;

/**
* Creates a new AbstractEvent instance.
Expand All @@ -63,13 +63,6 @@ abstract class AbstractEvent implements IEvent {
this.timeStamp = setTimeStamp ? Date.now() : 0;
}

/**
* _true_ if [[cancelable]] is true and [[preventDefault]] has been called on this event.
*/
public get defaultPrevented(): boolean {
return this._defaultPrevented;
}

/**
* When called during the dispatch of an event, will prevent any targets further in the event chain
* from being processed. All listeners on the current target will still be executed.
Expand All @@ -96,7 +89,7 @@ abstract class AbstractEvent implements IEvent {
*/
public preventDefault(): void {
if (this.cancelable) {
this._defaultPrevented = true;
this.defaultPrevented = true;
} else {
throw new Error('Called preventDefault on a non-cancelable event');
}
Expand Down
8 changes: 4 additions & 4 deletions src/lib/EventDispatcher.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Disposable from 'seng-disposable';
import sengDisposable from 'seng-disposable';
import IEventDispatcher from './IEventDispatcher';
import IEvent from './IEvent';
import EventListenerData from './EventListenerData';
Expand All @@ -13,7 +13,7 @@ import CallListenerResult from './CallListenerResult';
* by existing event dispatching systems like the functionality described in the
* [DOM Event W3 spec](https://www.w3.org/TR/DOM-Level-2-Events/events.html)
*/
export default class EventDispatcher extends Disposable implements IEventDispatcher {
export default class EventDispatcher extends sengDisposable implements IEventDispatcher {
/**
* The parent EventDispatcher instance. If this instance has no parent, this value will be
* set to _null_. The parent is used in the bubbling and capturing phases of events.
Expand Down Expand Up @@ -151,7 +151,7 @@ export default class EventDispatcher extends Disposable implements IEventDispatc

const data: EventListenerData = new EventListenerData(this, eventType, handler, useCapture, priority);
this.listeners[eventType].push(data);
this.listeners[eventType].sort(this._listenerSorter);
this.listeners[eventType].sort(this.listenerSorter);

return data;
}
Expand Down Expand Up @@ -242,7 +242,7 @@ export default class EventDispatcher extends Disposable implements IEventDispatc
* @param e2 The other event listener to compare to
* @returns A number that indicates the sorting according to the JS sort() method.
*/
private _listenerSorter(e1: EventListenerData, e2: EventListenerData): number {
private listenerSorter(e1: EventListenerData, e2: EventListenerData): number {
return e2.priority - e1.priority;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/lib/EventListenerData.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import Disposable from 'seng-disposable';
import sengDisposable from 'seng-disposable';
import EventDispatcher, { EventHandler } from './EventDispatcher';

/**
* Data object that is created on every call to [[EventDispatcher.addEventListener]]. The object is
* saved on the [[EventDispatcher.listeners]] object for internal use but is also returned by the
* _addEventListener_ method as a way to remove the listener.
*/
export default class EventListenerData extends Disposable {
export default class EventListenerData extends sengDisposable {
/**
* This property will be set to _true_ by the [[EventDispatcher]] this listener is bound to when
* the listener is removed. This is to make sure the handler is not called, even if the listener
Expand Down
1 change: 0 additions & 1 deletion tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"variable-name": [ true, "allow-pascal-case" ],
"import-name": true,
"no-increment-decrement": false,
"function-name": false,
"indent": [true, "tabs"],
"ter-indent": [
true,
Expand Down

0 comments on commit 9a15290

Please sign in to comment.