Skip to content

Commit 37dd4ea

Browse files
tiagoschenkeltiagoschenkel
authored
Merge pull request #9 from RobotlegsJS/tslint
Update TSLint rules
2 parents 64c17d0 + f23a37d commit 37dd4ea

File tree

18 files changed

+217
-157
lines changed

18 files changed

+217
-157
lines changed

‎dist/signals.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/org/osflash/signals/IOnceSignal.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { ISlot } from "./ISlot";
2+
23
/**
34
*
45
*/
@@ -41,6 +42,5 @@ export interface IOnceSignal {
4142
/**
4243
* Unsubscribes all listeners from the signal.
4344
*/
44-
removeAll(): void
45+
removeAll(): void;
4546
}
46-

‎src/org/osflash/signals/IPrioritySignal.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export interface IPrioritySignal extends ISignal {
1818
* @return a ISlot, which contains the Function passed as the parameter
1919
* @see ISlot
2020
*/
21-
addWithPriority(listener: Function, priority: number): ISlot
21+
addWithPriority(listener: Function, priority: number): ISlot;
2222

2323
/**
2424
* Subscribes a one-time listener for this signal.
@@ -34,6 +34,5 @@ export interface IPrioritySignal extends ISignal {
3434
* @return a ISlot, which contains the Function passed as the parameter
3535
* @see ISlot
3636
*/
37-
addOnceWithPriority(listener: Function, priority: number): ISlot
37+
addOnceWithPriority(listener: Function, priority: number): ISlot;
3838
}
39-

‎src/org/osflash/signals/ISignal.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { ISlot } from "./ISlot";
22
import { IOnceSignal } from "./IOnceSignal";
3+
34
/**
45
*
56
*/
@@ -14,4 +15,3 @@ export interface ISignal extends IOnceSignal {
1415
*/
1516
add(listener: Function): ISlot;
1617
}
17-

‎src/org/osflash/signals/ISlot.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,3 @@ export interface ISlot {
6969
*/
7070
remove(): void;
7171
}
72-

‎src/org/osflash/signals/MonoSignal.ts‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export class MonoSignal implements ISignal {
2929
*/
3030
constructor(...valueClasses) {
3131
// Cannot use super.apply(null, valueClasses), so allow the subclass to call super(valueClasses).
32-
this.valueClasses = (valueClasses.length == 1 && valueClasses[0] instanceof Array) ? valueClasses[0] : valueClasses;
32+
this.valueClasses = (valueClasses.length === 1 && valueClasses[0] instanceof Array) ? valueClasses[0] : valueClasses;
3333
}
3434

3535
/**
@@ -44,11 +44,11 @@ export class MonoSignal implements ISignal {
4444
public set valueClasses(value: any[]) {
4545
// Clone so the Array cannot be affected from outside.
4646
this._valueClasses = value ? value.slice() : [];
47-
for (var i: number = this._valueClasses.length; i--;) {
47+
for (let i: number = this._valueClasses.length; i--;) {
4848
if (typeof this._valueClasses[i] !== "function") {
49-
throw new Error('Invalid valueClasses argument: ' +
50-
'item at index ' + i + ' should be a Class but was:<' +
51-
this._valueClasses[i] + '>.' + this._valueClasses[i]); //@CHANGED - temp replacement for getQualifiedClassByName()
49+
throw new Error("Invalid valueClasses argument: " +
50+
"item at index " + i + " should be a Class but was:<" +
51+
this._valueClasses[i] + "'>." + this._valueClasses[i]); // @CHANGED - temp replacement for getQualifiedClassByName()
5252
}
5353
}
5454
}
@@ -78,8 +78,8 @@ export class MonoSignal implements ISignal {
7878

7979
/** @inheritDoc */
8080
public remove(listener: Function): ISlot {
81-
if (this.slot && this.slot.listener == listener) {
82-
var theSlot: ISlot = this.slot;
81+
if (this.slot && this.slot.listener === listener) {
82+
let theSlot: ISlot = this.slot;
8383
this.slot = null;
8484
return theSlot;
8585
}
@@ -89,7 +89,9 @@ export class MonoSignal implements ISignal {
8989

9090
/** @inheritDoc */
9191
public removeAll(): void {
92-
if (this.slot) this.slot.remove();
92+
if (this.slot) {
93+
this.slot.remove();
94+
}
9395
}
9496

9597
/**
@@ -99,18 +101,18 @@ export class MonoSignal implements ISignal {
99101
*/
100102
public dispatch(...valueObjects): void {
101103
// If valueClasses is empty, value objects are not type-checked.
102-
var numValueClasses: number = this._valueClasses.length;
103-
var numValueObjects: number = valueObjects.length;
104+
let numValueClasses: number = this._valueClasses.length;
105+
let numValueObjects: number = valueObjects.length;
104106

105107
// Cannot dispatch fewer objects than declared classes.
106108
if (numValueObjects < numValueClasses) {
107-
throw new Error('Incorrect number of arguments. ' +
108-
'Expected at least ' + numValueClasses + ' but received ' +
109-
numValueObjects + '.');
109+
throw new Error("Incorrect number of arguments. " +
110+
"Expected at least " + numValueClasses + " but received " +
111+
numValueObjects + ".");
110112
}
111113

112114
// Cannot dispatch differently typed objects than declared classes.
113-
for (var i: number = 0; i < numValueClasses; i++) {
115+
for (let i: number = 0; i < numValueClasses; i++) {
114116
// Optimized for the optimistic case that values are correct.
115117
if (
116118
valueObjects[i] === null ||
@@ -119,8 +121,8 @@ export class MonoSignal implements ISignal {
119121
continue;
120122
}
121123

122-
throw new Error('Value object <' + valueObjects[i]
123-
+ '> is not an instance of <' + this._valueClasses[i] + '>.');
124+
throw new Error("Value object <" + valueObjects[i]
125+
+ "> is not an instance of <" + this._valueClasses[i] + ">.");
124126
}
125127

126128
// Broadcast to the one listener.
@@ -132,11 +134,10 @@ export class MonoSignal implements ISignal {
132134
protected registerListener(listener: Function, once: boolean = false): ISlot {
133135
if (this.slot) {
134136
// If the listener exits previously added, definitely don't add it.
135-
throw new Error('You cannot add or addOnce with a listener already added, remove the current listener first.');
137+
throw new Error("You cannot add or addOnce with a listener already added, remove the current listener first.");
136138
}
137139

138140
return (this.slot = new Slot(listener, this, once));
139141
}
140142

141143
}
142-

‎src/org/osflash/signals/OnceSignal.ts‎

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export class OnceSignal implements IOnceSignal {
3636
*/
3737
constructor(...valueClasses) {
3838
// Cannot use super.apply(null, valueClasses), so allow the subclass to call super(valueClasses).
39-
this.valueClasses = (valueClasses.length == 1 && valueClasses[0] instanceof Array) ? valueClasses[0] : valueClasses;
39+
this.valueClasses = (valueClasses.length === 1 && valueClasses[0] instanceof Array) ? valueClasses[0] : valueClasses;
4040
}
4141

4242
/**
@@ -51,11 +51,11 @@ export class OnceSignal implements IOnceSignal {
5151
public set valueClasses(value: any[]) {
5252
// Clone so the Array cannot be affected from outside.
5353
this._valueClasses = value ? value.slice() : [];
54-
for (var i: number = this._valueClasses.length; i--;) {
54+
for (let i: number = this._valueClasses.length; i--;) {
5555
if (!(this._valueClasses[i] instanceof Object)) {
56-
throw new Error('Invalid valueClasses argument: ' +
57-
'item at index ' + i + ' should be a Class but was:<' +
58-
this._valueClasses[i] + '>.' + this._valueClasses[i]); //@CHANGED - temp replacement for getQualifiedClassByName()
56+
throw new Error("Invalid valueClasses argument: " +
57+
"item at index " + i + " should be a Class but was:<" +
58+
this._valueClasses[i] + ">." + this._valueClasses[i]); // @CHANGED - temp replacement for getQualifiedClassByName()
5959
}
6060
}
6161
}
@@ -76,8 +76,10 @@ export class OnceSignal implements IOnceSignal {
7676

7777
/** @inheritDoc */
7878
public remove(listener: Function): ISlot {
79-
var slot: ISlot = this.slots.find(listener);
80-
if (!slot) return null;
79+
let slot: ISlot = this.slots.find(listener);
80+
if (!slot) {
81+
return null;
82+
}
8183

8284
this.slots = this.slots.filterNot(listener);
8385
return slot;
@@ -96,18 +98,18 @@ export class OnceSignal implements IOnceSignal {
9698
public dispatch(...valueObjects): void {
9799

98100
// If valueClasses is empty, value objects are not type-checked.
99-
var numValueClasses: number = this._valueClasses.length;
100-
var numValueObjects: number = valueObjects.length;
101+
let numValueClasses: number = this._valueClasses.length;
102+
let numValueObjects: number = valueObjects.length;
101103

102104
// Cannot dispatch fewer objects than declared classes.
103105
if (numValueObjects < numValueClasses) {
104-
throw new Error('Incorrect number of arguments. ' +
105-
'Expected at least ' + numValueClasses + ' but received ' +
106-
numValueObjects + '.');
106+
throw new Error("Incorrect number of arguments. " +
107+
"Expected at least " + numValueClasses + " but received " +
108+
numValueObjects + ".");
107109
}
108110

109111
// Cannot dispatch differently typed objects than declared classes.
110-
for (var i: number = 0; i < numValueClasses; i++) {
112+
for (let i: number = 0; i < numValueClasses; i++) {
111113
// Optimized for the optimistic case that values are correct.
112114
if (
113115
valueObjects[i] === null ||
@@ -116,12 +118,12 @@ export class OnceSignal implements IOnceSignal {
116118
continue;
117119
}
118120

119-
throw new Error('Value object <' + valueObjects[i]
120-
+ '> is not an instance of <' + this._valueClasses[i] + '>.');
121+
throw new Error("Value object <" + valueObjects[i]
122+
+ "> is not an instance of <" + this._valueClasses[i] + ">.");
121123
}
122124

123125
// Broadcast to listeners.
124-
var slotsToProcess: SlotList = this.slots;
126+
let slotsToProcess: SlotList = this.slots;
125127
if (slotsToProcess.nonEmpty) {
126128
while (slotsToProcess.nonEmpty) {
127129
slotsToProcess.head.execute(valueObjects);
@@ -132,7 +134,7 @@ export class OnceSignal implements IOnceSignal {
132134

133135
protected registerListener(listener: Function, once: boolean = false): ISlot {
134136
if (this.registrationPossible(listener, once)) {
135-
var newSlot: ISlot = new Slot(listener, this, once);
137+
let newSlot: ISlot = new Slot(listener, this, once);
136138
this.slots = this.slots.prepend(newSlot);
137139
return newSlot;
138140
}
@@ -141,18 +143,21 @@ export class OnceSignal implements IOnceSignal {
141143
}
142144

143145
protected registrationPossible(listener: Function, once: boolean): boolean {
144-
if (!this.slots.nonEmpty) return true;
146+
if (!this.slots.nonEmpty) {
147+
return true;
148+
}
145149

146-
var existingSlot: ISlot = this.slots.find(listener);
147-
if (!existingSlot) return true;
150+
let existingSlot: ISlot = this.slots.find(listener);
151+
if (!existingSlot) {
152+
return true;
153+
}
148154

149-
if (existingSlot.once != once) {
155+
if (existingSlot.once !== once) {
150156
// If the listener was previously added, definitely don't add it again.
151157
// But throw an exception if their once values differ.
152-
throw new Error('You cannot addOnce() then add() the same listener without removing the relationship first.');
158+
throw new Error("You cannot addOnce() then add() the same listener without removing the relationship first.");
153159
}
154160

155161
return false; // Listener was already registered.
156162
}
157163
}
158-

‎src/org/osflash/signals/PrioritySignal.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export class PrioritySignal extends Signal implements IPrioritySignal {
77

88
constructor(...valueClasses) {
99
// Cannot use super.apply(null, valueClasses), so allow the subclass to call super(valueClasses).
10-
valueClasses = (valueClasses.length == 1 && valueClasses[0] instanceof Array) ? valueClasses[0] : valueClasses;
10+
valueClasses = (valueClasses.length === 1 && valueClasses[0] instanceof Array) ? valueClasses[0] : valueClasses;
1111

1212
super(valueClasses);
1313
}
@@ -37,13 +37,11 @@ export class PrioritySignal extends Signal implements IPrioritySignal {
3737

3838
protected registerListenerWithPriority(listener: Function, once: boolean = false, priority: number = 0): ISlot {
3939
if (this.registrationPossible(listener, once)) {
40-
var slot: ISlot = new Slot(listener, this, once, priority);
40+
let slot: ISlot = new Slot(listener, this, once, priority);
4141
this.slots = this.slots.insertWithPriority(slot);
4242
return slot;
4343
}
4444

4545
return this.slots.find(listener);
4646
}
47-
4847
}
49-

‎src/org/osflash/signals/Promise.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export class Promise extends OnceSignal {
88
/** @inheritDoc */
99
/*override*/
1010
public addOnce(listener: Function): ISlot {
11-
var slot: ISlot = super.addOnce(listener);
11+
let slot: ISlot = super.addOnce(listener);
1212
if (this.isDispatched) {
1313
slot.execute(this.valueObjects);
1414
slot.remove();
@@ -25,12 +25,10 @@ export class Promise extends OnceSignal {
2525
public dispatch(...valueObjects): void {
2626
if (this.isDispatched) {
2727
throw new Error("You cannot dispatch() a Promise more than once");
28-
}
29-
else {
28+
} else {
3029
this.isDispatched = true;
3130
this.valueObjects = valueObjects;
3231
super.dispatch.apply(this, valueObjects);
3332
}
3433
}
3534
}
36-

‎src/org/osflash/signals/Signal.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class Signal extends OnceSignal implements ISignal {
3232
*/
3333
constructor(...valueClasses) {
3434
// Cannot use super.apply(null, valueClasses), so allow the subclass to call super(valueClasses).
35-
valueClasses = (valueClasses.length == 1 && valueClasses[0] instanceof Array) ? valueClasses[0] : valueClasses;
35+
valueClasses = (valueClasses.length === 1 && valueClasses[0] instanceof Array) ? valueClasses[0] : valueClasses;
3636

3737
super(valueClasses);
3838
}
@@ -46,4 +46,3 @@ export class Signal extends OnceSignal implements ISignal {
4646
return this.registerListener(listener);
4747
}
4848
}
49-

0 commit comments

Comments
 (0)