You've already forked matrix-js-sdk
mirror of
https://github.com/matrix-org/matrix-js-sdk.git
synced 2025-11-29 16:43:09 +03:00
Use utils.extend instead of Object.assign
... because javascript is awful
This commit is contained in:
@@ -18,6 +18,8 @@ limitations under the License.
|
||||
/** @module interactive-auth */
|
||||
var q = require("q");
|
||||
|
||||
var utils = require("./utils");
|
||||
|
||||
/**
|
||||
* Abstracts the logic used to drive the interactive auth process.
|
||||
*
|
||||
@@ -116,7 +118,7 @@ InteractiveAuth.prototype = {
|
||||
var auth = {
|
||||
session: this._data.session,
|
||||
};
|
||||
Object.assign(auth, authData);
|
||||
utils.extend(auth, authData);
|
||||
|
||||
this._doRequest(auth);
|
||||
},
|
||||
|
||||
@@ -337,6 +337,9 @@ var deepCompare = module.exports.deepCompare = function(x, y) {
|
||||
*
|
||||
* All enumerable properties, included inherited ones, are copied.
|
||||
*
|
||||
* This is approximately equivalent to ES6's Object.assign, except
|
||||
* that the latter doesn't copy inherited properties.
|
||||
*
|
||||
* @param {Object} target The object that will receive new properties
|
||||
* @param {...Object} source Objects from which to copy properties
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user