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

Fix import merge conflicts, removing any that aren't needed anymore

Browse source 
Many imports were removed as part of refactoring work, so here we are.
This commit is contained in:
Travis Ralston 2020-01-09 14:15:38 -07:00
parent a0da13200f
commit 3e5cc9550b
26 changed files with 6 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/structures/EmbeddedPage.js
View file

@ -25,12 +25,7 @@ import { _t } from '../../languageHandler';
import sanitizeHtml from 'sanitize-html';
import * as sdk from '../../index';
import dis from '../../dispatcher';
<<<<<<< HEAD
import {MatrixClientPeg} from '../../MatrixClientPeg';
import { MatrixClient } from 'matrix-js-sdk';
=======
import MatrixClientPeg from '../../MatrixClientPeg';
>>>>>>> develop
import classnames from 'classnames';
import MatrixClientContext from "../../contexts/MatrixClientContext";

5
src/components/structures/LeftPanel.js
View file

@ -22,12 +22,7 @@ import classNames from 'classnames';
import { Key } from '../../Keyboard';
import * as sdk from '../../index';
import dis from '../../dispatcher';
<<<<<<< HEAD
import * as VectorConferenceHandler from '../../VectorConferenceHandler';
import TagPanelButtons from './TagPanelButtons';
=======
import VectorConferenceHandler from '../../VectorConferenceHandler';
>>>>>>> develop
import SettingsStore from '../../settings/SettingsStore';
import {_t} from "../../languageHandler";
import Analytics from "../../Analytics";

6
src/components/structures/MyGroups.js
View file

@ -17,13 +17,7 @@ limitations under the License.
import React from 'react';
import createReactClass from 'create-react-class';
<<<<<<< HEAD
import PropTypes from 'prop-types';
import { MatrixClient } from 'matrix-js-sdk';
import * as sdk from '../../index';
=======
import sdk from '../../index';
>>>>>>> develop
import { _t } from '../../languageHandler';
import dis from '../../dispatcher';
import AccessibleButton from '../views/elements/AccessibleButton';

4
src/components/structures/RoomDirectory.js
View file

@ -27,11 +27,7 @@ import PropTypes from 'prop-types';
import { _t } from '../../languageHandler';
import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils';
import Analytics from '../../Analytics';
<<<<<<< HEAD
import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
=======
import MatrixClientContext from "../../contexts/MatrixClientContext";
>>>>>>> develop
const MAX_NAME_LENGTH = 80;
const MAX_TOPIC_LENGTH = 160;

3
src/components/structures/RoomView.js
View file

@ -53,11 +53,8 @@ import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
import WidgetUtils from '../../utils/WidgetUtils';
import AccessibleButton from "../views/elements/AccessibleButton";
import RightPanelStore from "../../stores/RightPanelStore";
<<<<<<< HEAD
import {haveTileForEvent} from "../views/rooms/EventTile";
=======
import RoomContext from "../../contexts/RoomContext";
>>>>>>> develop
const DEBUG = false;
let debuglog = function() {};

11
src/components/structures/TimelinePanel.js
View file

@ -25,22 +25,13 @@ import PropTypes from 'prop-types';
import {EventTimeline} from "matrix-js-sdk";
import * as Matrix from "matrix-js-sdk";
import { _t } from '../../languageHandler';
<<<<<<< HEAD
import {MatrixClientPeg} from "../../MatrixClientPeg";
import * as ObjectUtils from "../../ObjectUtils";
import UserActivity from "../../UserActivity";
import Modal from "../../Modal";
import dis from "../../dispatcher";
import * as sdk from "../../index";
import { KeyCode } from '../../Keyboard';
=======
const MatrixClientPeg = require("../../MatrixClientPeg");
const dis = require("../../dispatcher");
const ObjectUtils = require('../../ObjectUtils');
const Modal = require("../../Modal");
const UserActivity = require("../../UserActivity");
import {Key} from '../../Keyboard';
>>>>>>> develop
import { Key } from '../../Keyboard';
import Timer from '../../utils/Timer';
import shouldHideEvent from '../../shouldHideEvent';
import EditorStateTransfer from '../../utils/EditorStateTransfer';