matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Code Activity

delint and replace more defers

Browse Source
This commit is contained in:
Michael Telatynski
2019-11-25 14:48:45 +00:00
parent bab4582139
commit 733008cfc4
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/unit/crypto/DeviceList.spec.js
View File

@@ -20,8 +20,6 @@ import MemoryCryptoStore from '../../../lib/crypto/store/memory-crypto-store.js'
import utils from '../../../lib/utils'; import utils from '../../../lib/utils';
import logger from '../../../src/logger'; import logger from '../../../src/logger';
import Promise from 'bluebird';
const signedDeviceList = { const signedDeviceList = {
"failures": {}, "failures": {},
"device_keys": { "device_keys": {

6
src/http-api.js
View File

@@ -256,7 +256,7 @@ module.exports.MatrixHttpApi.prototype = {
} }
if (global.XMLHttpRequest) { if (global.XMLHttpRequest) {
const defer = Promise.defer(); const defer = utils.defer();
const xhr = new global.XMLHttpRequest(); const xhr = new global.XMLHttpRequest();
upload.xhr = xhr; upload.xhr = xhr;
const cb = requestCallback(defer, opts.callback, this.opts.onlyData); const cb = requestCallback(defer, opts.callback, this.opts.onlyData);
@@ -418,7 +418,7 @@ module.exports.MatrixHttpApi.prototype = {
opts.headers['Authorization'] = `Bearer ${accessToken}`; opts.headers['Authorization'] = `Bearer ${accessToken}`;
} }
const defer = Promise.defer(); const defer = utils.defer();
this.opts.request( this.opts.request(
opts, opts,
requestCallback(defer, callback, this.opts.onlyData), requestCallback(defer, callback, this.opts.onlyData),
@@ -682,7 +682,7 @@ module.exports.MatrixHttpApi.prototype = {
} }
} }
const defer = Promise.defer(); const defer = utils.defer();
let timeoutId; let timeoutId;
let timedOut = false; let timedOut = false;

2
src/scheduler.js
View File

@@ -121,7 +121,7 @@ MatrixScheduler.prototype.queueEvent = function(event) {
if (!this._queues[queueName]) { if (!this._queues[queueName]) {
this._queues[queueName] = []; this._queues[queueName] = [];
} }
const defer = Promise.defer(); const defer = utils.defer();
this._queues[queueName].push({ this._queues[queueName].push({
event: event, event: event,
defer: defer, defer: defer,

2
src/sync.js
View File

@@ -1383,7 +1383,7 @@ SyncApi.prototype._startKeepAlives = function(delay) {
self._pokeKeepAlive(); self._pokeKeepAlive();
} }
if (!this._connectionReturnedDefer) { if (!this._connectionReturnedDefer) {
this._connectionReturnedDefer = Promise.defer(); this._connectionReturnedDefer = utils.defer();
} }
return this._connectionReturnedDefer.promise; return this._connectionReturnedDefer.promise;
}; };