mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
[WEBLATE] merge develop
This commit is contained in:
commit
c5fa3a7df6
@ -76,6 +76,7 @@
|
||||
"react-dom": "^15.4.0",
|
||||
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
|
||||
"sanitize-html": "^1.11.1",
|
||||
"text-encoding-utf-8": "^1.0.1",
|
||||
"ua-parser-js": "^0.7.10",
|
||||
"url": "^0.11.0",
|
||||
"velocity-vector": "vector-im/velocity#059e3b2"
|
||||
|
@ -18,8 +18,6 @@ limitations under the License.
|
||||
'use strict';
|
||||
|
||||
import React from 'react';
|
||||
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
|
||||
import sdk from 'matrix-react-sdk';
|
||||
import GeminiScrollbar from 'react-gemini-scrollbar';
|
||||
import request from 'browser-request';
|
||||
import { _t } from 'matrix-react-sdk/lib/languageHandler';
|
||||
|
@ -20,7 +20,6 @@ import React from 'react';
|
||||
import {DragSource} from 'react-dnd';
|
||||
import {DropTarget} from 'react-dnd';
|
||||
|
||||
import dis from 'matrix-react-sdk/lib/dispatcher';
|
||||
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
|
||||
import sdk from 'matrix-react-sdk';
|
||||
import { _t } from 'matrix-react-sdk/lib/languageHandler';
|
||||
|
@ -158,7 +158,7 @@ describe('joining a room', function () {
|
||||
|
||||
ReactTestUtils.Simulate.click(joinLink);
|
||||
|
||||
httpBackend.when('POST', '/join/'+encodeURIComponent(ROOM_ID))
|
||||
httpBackend.when('POST', '/join/'+encodeURIComponent(ROOM_ALIAS))
|
||||
.respond(200, {room_id: ROOM_ID});
|
||||
}).then(() => {
|
||||
// wait for the join request to be made
|
||||
@ -180,7 +180,7 @@ describe('joining a room', function () {
|
||||
roomView, "mx_Spinner");
|
||||
|
||||
// flush it through
|
||||
return httpBackend.flush('/join/'+encodeURIComponent(ROOM_ID));
|
||||
return httpBackend.flush('/join/'+encodeURIComponent(ROOM_ALIAS));
|
||||
}).then(() => {
|
||||
httpBackend.verifyNoOutstandingExpectation();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user