|
53 | 53 | function $WebSocketProvider($rootScope, $q, $timeout, $websocketBackend) { |
54 | 54 |
|
55 | 55 | function $WebSocket(url, protocols, options) { |
56 | | - // var bits = url.split('/'); |
57 | | - |
58 | 56 | if (!options && isObject(protocols) && !isArray(protocols)) { |
59 | 57 | options = protocols; |
60 | 58 | protocols = undefined; |
|
257 | 255 |
|
258 | 256 | $WebSocket.prototype.send = function send(data) { |
259 | 257 | var deferred = $q.defer(); |
260 | | - var socketInstance = this; |
| 258 | + var self = this; |
261 | 259 | var promise = cancelableify(deferred.promise); |
262 | 260 |
|
263 | | - if (socketInstance.readyState === socketInstance._readyStateConstants.RECONNECT_ABORTED) { |
| 261 | + if (self.readyState === self._readyStateConstants.RECONNECT_ABORTED) { |
264 | 262 | deferred.reject('Socket connection has been closed'); |
265 | 263 | } |
266 | 264 | else { |
267 | | - socketInstance.sendQueue.push({ |
| 265 | + self.sendQueue.push({ |
268 | 266 | message: data, |
269 | 267 | deferred: deferred |
270 | 268 | }); |
271 | | - socketInstance.fireQueue(); |
| 269 | + self.fireQueue(); |
272 | 270 | } |
273 | 271 |
|
274 | 272 | // Credit goes to @btford |
|
283 | 281 | } |
284 | 282 |
|
285 | 283 | function cancel(reason) { |
286 | | - socketInstance.sendQueue.splice(socketInstance.sendQueue.indexOf(data), 1); |
| 284 | + self.sendQueue.splice(self.sendQueue.indexOf(data), 1); |
287 | 285 | deferred.reject(reason); |
288 | | - return socketInstance; |
| 286 | + return self; |
289 | 287 | } |
290 | 288 |
|
291 | 289 | return promise; |
|
344 | 342 | }; |
345 | 343 | } |
346 | 344 |
|
347 | | - // $WebSocketBackendProvider.$inject = ['$window']; |
| 345 | + // $WebSocketBackendProvider.$inject = ['$window', '$log']; |
348 | 346 | function $WebSocketBackendProvider($window, $log) { |
349 | 347 | this.create = function create(url, protocols) { |
350 | 348 | var match = /wss?:\/\//.exec(url); |
|
0 commit comments