OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix js-sdk imports for new module

pull/21833/head
Travis Ralston 2019-12-19 18:54:36 -07:00
parent 7993515099
commit be4eeb5e07
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/MatrixClientPeg.js
View File

@ -19,9 +19,9 @@ limitations under the License.
import {MatrixClient, MemoryStore} from 'matrix-js-sdk'; import {MatrixClient, MemoryStore} from 'matrix-js-sdk';
import utils from 'matrix-js-sdk/lib/utils'; import * as utils from 'matrix-js-sdk/lib/utils';
import EventTimeline from 'matrix-js-sdk/lib/models/event-timeline'; import {EventTimeline} from 'matrix-js-sdk/lib/models/event-timeline';
import EventTimelineSet from 'matrix-js-sdk/lib/models/event-timeline-set'; import {EventTimelineSet} from 'matrix-js-sdk/lib/models/event-timeline-set';
import * as sdk from './index'; import * as sdk from './index';
import createMatrixClient from './utils/createMatrixClient'; import createMatrixClient from './utils/createMatrixClient';
import SettingsStore from './settings/SettingsStore'; import SettingsStore from './settings/SettingsStore';

2
src/RoomNotifs.js
View File

@ -16,7 +16,7 @@ limitations under the License.
*/ */
import MatrixClientPeg from './MatrixClientPeg'; import MatrixClientPeg from './MatrixClientPeg';
import PushProcessor from 'matrix-js-sdk/lib/pushprocessor'; import {PushProcessor} from 'matrix-js-sdk/lib/pushprocessor';
export const ALL_MESSAGES_LOUD = 'all_messages_loud'; export const ALL_MESSAGES_LOUD = 'all_messages_loud';
export const ALL_MESSAGES = 'all_messages'; export const ALL_MESSAGES = 'all_messages';

2
src/settings/controllers/NotificationControllers.js
View File

@ -18,7 +18,7 @@ import SettingController from "./SettingController";
import MatrixClientPeg from '../../MatrixClientPeg'; import MatrixClientPeg from '../../MatrixClientPeg';
// XXX: This feels wrong. // XXX: This feels wrong.
import PushProcessor from "matrix-js-sdk/lib/pushprocessor"; import {PushProcessor} from "matrix-js-sdk/lib/pushprocessor";
function isMasterRuleEnabled() { function isMasterRuleEnabled() {
// Return the value of the master push rule as a default // Return the value of the master push rule as a default

2
src/utils/StorageManager.js
View File

@ -15,7 +15,7 @@ limitations under the License.
*/ */
import Matrix from 'matrix-js-sdk'; import Matrix from 'matrix-js-sdk';
import LocalStorageCryptoStore from 'matrix-js-sdk/lib/crypto/store/localStorage-crypto-store'; import {LocalStorageCryptoStore} from 'matrix-js-sdk/lib/crypto/store/localStorage-crypto-store';
import Analytics from '../Analytics'; import Analytics from '../Analytics';
const localStorage = window.localStorage; const localStorage = window.localStorage;

2
src/utils/permalinks/Permalinks.js
View File

@ -16,7 +16,7 @@ limitations under the License.
import MatrixClientPeg from "../../MatrixClientPeg"; import MatrixClientPeg from "../../MatrixClientPeg";
import isIp from "is-ip"; import isIp from "is-ip";
import utils from 'matrix-js-sdk/lib/utils'; import * as utils from 'matrix-js-sdk/lib/utils';
import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor"; import SpecPermalinkConstructor, {baseUrl as matrixtoBaseUrl} from "./SpecPermalinkConstructor";
import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor"; import PermalinkConstructor, {PermalinkParts} from "./PermalinkConstructor";
import RiotPermalinkConstructor from "./RiotPermalinkConstructor"; import RiotPermalinkConstructor from "./RiotPermalinkConstructor";

2
src/utils/pillify.js
View File

@ -17,7 +17,7 @@ limitations under the License.
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import MatrixClientPeg from '../MatrixClientPeg'; import MatrixClientPeg from '../MatrixClientPeg';
import SettingsStore from "../settings/SettingsStore"; import SettingsStore from "../settings/SettingsStore";
import PushProcessor from 'matrix-js-sdk/lib/pushprocessor'; import {PushProcessor} from 'matrix-js-sdk/lib/pushprocessor';
import * as sdk from '../index'; import * as sdk from '../index';
export function pillifyLinks(nodes, mxEvent) { export function pillifyLinks(nodes, mxEvent) {