|
144 | 144 | };
|
145 | 145 | },
|
146 | 146 |
|
147 |
| - // Create a deferred object: A pending promise with `resolve`, `fulfil` and `reject` methods |
| 147 | + // Create a deferred object: A pending promise with `resolve`, `fulfill` and `reject` |
| 148 | + // methods |
148 | 149 | createDeferred = function () {
|
149 | 150 | var
|
150 | 151 | // Promise's current state
|
|
156 | 157 |
|
157 | 158 | // Queues of fulfillment / rejection handlers. Handlers are added whenever the
|
158 | 159 | // promise's `then` method is invoked
|
159 |
| - fulfilQueue = [], |
| 160 | + fulfillQueue = [], |
160 | 161 | rejectQueue = [],
|
161 | 162 |
|
162 | 163 | // The actual promise. The deferred will derive from this
|
|
178 | 179 | // promise is already fulfilled or as soon as (and if) that eventually happens
|
179 | 180 | var evaluator = createEvaluator(onFulfilled, dependantDeferred);
|
180 | 181 | state === "fulfilled" ? evaluateOnNextTurn(evaluator, result) :
|
181 |
| - fulfilQueue.push(evaluator); |
| 182 | + fulfillQueue.push(evaluator); |
182 | 183 | },
|
183 | 184 |
|
184 | 185 | // Queue a handler and a dependant deferred for rejection. When (and if) the promise
|
|
201 | 202 | },
|
202 | 203 |
|
203 | 204 | // Fulfil the promise. Will run the queued fulfillment-handlers and resolve
|
204 |
| - // dependant promises. Note that the `fulfil` method will be exposed on the |
| 205 | + // dependant promises. Note that the `fulfill` method will be exposed on the |
205 | 206 | // returned deferred *only* - not on any returned promise: not by the deferred's
|
206 | 207 | // underlying promise or those returned by invoking `then`
|
207 | 208 | fulfill = function (value) {
|
208 | 209 |
|
209 |
| - // Dont fulfil the promise unless it's currently in a pending state |
| 210 | + // Dont fulfill the promise unless it's currently in a pending state |
210 | 211 | if (state !== "pending") { return; }
|
211 | 212 |
|
212 | 213 | // Fulfil the promise
|
213 | 214 | state = "fulfilled";
|
214 |
| - for (var i = 0, l = fulfilQueue.length; i < l; ++i) { fulfilQueue[i](value); } |
215 |
| - fulfilQueue = []; |
| 215 | + for (var i = 0, l = fulfillQueue.length; i < l; ++i) { fulfillQueue[i](value); } |
| 216 | + fulfillQueue = []; |
216 | 217 | result = value;
|
217 | 218 | },
|
218 | 219 |
|
219 | 220 | // Reject the promise. Will run the queued rejection-handlers and resolve
|
220 |
| - // dependant promises. As with the `fulfil` method, the `reject` method will be |
| 221 | + // dependant promises. As with the `fulfill` method, the `reject` method will be |
221 | 222 | // exposed on the returned deferred *only* - not on any returned promise
|
222 | 223 | reject = function (reason) {
|
223 | 224 |
|
|
268 | 269 | // Attach the `defer` / `getVersion` methods to Tillthen and return it
|
269 | 270 | return extend(tillthen, {
|
270 | 271 |
|
271 |
| - // Get a deferred object: A pending promise with `resolve`, `fulfil` and `reject` methods |
| 272 | + // Get a deferred object: A pending promise with `resolve`, `fulfill` and `reject` methods |
272 | 273 | defer: createDeferred,
|
273 | 274 |
|
274 | 275 | // Get current version of Tillthen
|
|
0 commit comments