imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix more imports post-merge

Browse source
This commit is contained in:
Travis Ralston 2020-01-09 14:16:32 -07:00
parent dc914774fb
commit 135c84251c
9 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/context_menus/TopLeftMenu.js
View file

@ -25,7 +25,7 @@ import SdkConfig from '../../../SdkConfig';
import { getHostingLink } from '../../../utils/HostingLink'; import { getHostingLink } from '../../../utils/HostingLink';
import {MatrixClientPeg} from '../../../MatrixClientPeg'; import {MatrixClientPeg} from '../../../MatrixClientPeg';
import {MenuItem} from "../../structures/ContextMenu"; import {MenuItem} from "../../structures/ContextMenu";
import sdk from "../../../index"; import * as sdk from "../../../index";
export class TopLeftMenu extends React.Component { export class TopLeftMenu extends React.Component {
static propTypes = { static propTypes = {

8
src/components/views/dialogs/DMInviteDialog.js
View file

@ -17,14 +17,14 @@ limitations under the License.
import React, {createRef} from 'react'; import React, {createRef} from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import {_t} from "../../../languageHandler"; import {_t} from "../../../languageHandler";
import sdk from "../../../index"; import * as sdk from "../../../index";
import MatrixClientPeg from "../../../MatrixClientPeg"; import {MatrixClientPeg} from "../../../MatrixClientPeg";
import {makeUserPermalink} from "../../../utils/permalinks/Permalinks"; import {makeUserPermalink} from "../../../utils/permalinks/Permalinks";
import DMRoomMap from "../../../utils/DMRoomMap"; import DMRoomMap from "../../../utils/DMRoomMap";
import {RoomMember} from "matrix-js-sdk/lib/matrix"; import {RoomMember} from "matrix-js-sdk/src/matrix";
import * as humanize from "humanize"; import * as humanize from "humanize";
import SdkConfig from "../../../SdkConfig"; import SdkConfig from "../../../SdkConfig";
import {getHttpUriForMxc} from "matrix-js-sdk/lib/content-repo"; import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
import * as Email from "../../../email"; import * as Email from "../../../email";
import {getDefaultIdentityServerUrl, useDefaultIdentityServer} from "../../../utils/IdentityServerUtils"; import {getDefaultIdentityServerUrl, useDefaultIdentityServer} from "../../../utils/IdentityServerUtils";
import {abbreviateUrl} from "../../../utils/UrlUtils"; import {abbreviateUrl} from "../../../utils/UrlUtils";

3
src/components/views/elements/ToggleSwitch.js
View file

@ -18,8 +18,7 @@ limitations under the License.
import React from "react"; import React from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import classNames from "classnames"; import classNames from "classnames";
import * as sdk from "../../../index";
import sdk from "../../../index";
// Controlled Toggle Switch element, written with Accessibility in mind // Controlled Toggle Switch element, written with Accessibility in mind
const ToggleSwitch = ({checked, disabled=false, onChange, ...props}) => { const ToggleSwitch = ({checked, disabled=false, onChange, ...props}) => {

2
src/components/views/room_settings/RoomProfileSettings.js
View file

@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
import {_t} from "../../../languageHandler"; import {_t} from "../../../languageHandler";
import {MatrixClientPeg} from "../../../MatrixClientPeg"; import {MatrixClientPeg} from "../../../MatrixClientPeg";
import Field from "../elements/Field"; import Field from "../elements/Field";
import sdk from "../../../index"; import * as sdk from "../../../index";
// TODO: Merge with ProfileSettings? // TODO: Merge with ProfileSettings?
export default class RoomProfileSettings extends React.Component { export default class RoomProfileSettings extends React.Component {

2
src/components/views/rooms/RoomList.js
View file

@ -21,7 +21,7 @@ import React from "react";
import ReactDOM from "react-dom"; import ReactDOM from "react-dom";
import createReactClass from 'create-react-class'; import createReactClass from 'create-react-class';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import utils from "matrix-js-sdk/lib/utils"; import * as utils from "matrix-js-sdk/src/utils";
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import {MatrixClientPeg} from "../../../MatrixClientPeg"; import {MatrixClientPeg} from "../../../MatrixClientPeg";
import rate_limited_func from "../../../ratelimitedfunc"; import rate_limited_func from "../../../ratelimitedfunc";

2
src/components/views/settings/AvatarSetting.js
View file

@ -17,7 +17,7 @@ limitations under the License.
import React, {useCallback} from "react"; import React, {useCallback} from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import sdk from "../../../index"; import * as sdk from "../../../index";
import {_t} from "../../../languageHandler"; import {_t} from "../../../languageHandler";
import Modal from "../../../Modal"; import Modal from "../../../Modal";

2
src/components/views/settings/ProfileSettings.js
View file

@ -20,7 +20,7 @@ import {MatrixClientPeg} from "../../../MatrixClientPeg";
import Field from "../elements/Field"; import Field from "../elements/Field";
import {User} from "matrix-js-sdk"; import {User} from "matrix-js-sdk";
import { getHostingLink } from '../../../utils/HostingLink'; import { getHostingLink } from '../../../utils/HostingLink';
import sdk from "../../../index"; import * as sdk from "../../../index";
export default class ProfileSettings extends React.Component { export default class ProfileSettings extends React.Component {
constructor() { constructor() {

8
src/components/views/settings/tabs/room/BridgeSettingsTab.js
View file

@ -17,11 +17,11 @@ limitations under the License.
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import {_t} from "../../../../../languageHandler"; import {_t} from "../../../../../languageHandler";
import MatrixClientPeg from "../../../../../MatrixClientPeg"; import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
import Pill from "../../../elements/Pill"; import Pill from "../../../elements/Pill";
import {makeUserPermalink} from "../../../../../utils/permalinks/Permalinks"; import {makeUserPermalink} from "../../../../../utils/permalinks/Permalinks";
import BaseAvatar from "../../../avatars/BaseAvatar"; import BaseAvatar from "../../../avatars/BaseAvatar";
import { ContentRepo } from "matrix-js-sdk"; import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
const BRIDGE_EVENT_TYPES = [ const BRIDGE_EVENT_TYPES = [
"uk.half-shot.bridge", "uk.half-shot.bridge",
@ -83,7 +83,7 @@ export default class BridgeSettingsTab extends React.Component {
let networkIcon = null; let networkIcon = null;
if (networkName && network.avatar) { if (networkName && network.avatar) {
const avatarUrl = ContentRepo.getHttpUriForMxc( const avatarUrl = getHttpUriForMxc(
MatrixClientPeg.get().getHomeserverUrl(), MatrixClientPeg.get().getHomeserverUrl(),
network.avatar, 32, 32, "crop", network.avatar, 32, 32, "crop",
); );
@ -99,7 +99,7 @@ export default class BridgeSettingsTab extends React.Component {
let channelIcon = null; let channelIcon = null;
if (channel.avatar) { if (channel.avatar) {
const avatarUrl = ContentRepo.getHttpUriForMxc( const avatarUrl = getHttpUriForMxc(
MatrixClientPeg.get().getHomeserverUrl(), MatrixClientPeg.get().getHomeserverUrl(),
channel.avatar, 32, 32, "crop", channel.avatar, 32, 32, "crop",
); );

2
src/utils/DMRoomMap.js
View file

@ -17,7 +17,7 @@ limitations under the License.
import {MatrixClientPeg} from '../MatrixClientPeg'; import {MatrixClientPeg} from '../MatrixClientPeg';
import _uniq from 'lodash/uniq'; import _uniq from 'lodash/uniq';
import {Room} from "matrix-js-sdk/lib/matrix"; import {Room} from "matrix-js-sdk/src/matrix";
/** /**
* Class that takes a Matrix Client and flips the m.direct map * Class that takes a Matrix Client and flips the m.direct map