Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 05:55:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

avoid using import * as Matrix

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2019-08-06 14:04:33 +01:00
parent 224dac3ffb
commit d99fb4796f
7 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/async-components/views/dialogs/ExportE2eKeysDialog.js
View File

@ -19,7 +19,7 @@ import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import * as Matrix from 'matrix-js-sdk'; import { MatrixClient } from 'matrix-js-sdk';
import * as MegolmExportEncryption from '../../../utils/MegolmExportEncryption'; import * as MegolmExportEncryption from '../../../utils/MegolmExportEncryption';
import sdk from '../../../index'; import sdk from '../../../index';
@ -30,7 +30,7 @@ export default React.createClass({
displayName: 'ExportE2eKeysDialog', displayName: 'ExportE2eKeysDialog',
propTypes: { propTypes: {
matrixClient: PropTypes.instanceOf(Matrix.MatrixClient).isRequired, matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
onFinished: PropTypes.func.isRequired, onFinished: PropTypes.func.isRequired,
}, },

4
src/async-components/views/dialogs/ImportE2eKeysDialog.js
View File

@ -17,7 +17,7 @@ limitations under the License.
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import * as Matrix from 'matrix-js-sdk'; import { MatrixClient } from 'matrix-js-sdk';
import * as MegolmExportEncryption from '../../../utils/MegolmExportEncryption'; import * as MegolmExportEncryption from '../../../utils/MegolmExportEncryption';
import sdk from '../../../index'; import sdk from '../../../index';
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
@ -41,7 +41,7 @@ export default React.createClass({
displayName: 'ImportE2eKeysDialog', displayName: 'ImportE2eKeysDialog',
propTypes: { propTypes: {
matrixClient: PropTypes.instanceOf(Matrix.MatrixClient).isRequired, matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
onFinished: PropTypes.func.isRequired, onFinished: PropTypes.func.isRequired,
}, },

6
src/components/structures/LoggedInView.js
View File

@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
import * as Matrix from 'matrix-js-sdk'; import { MatrixClient } from 'matrix-js-sdk';
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { DragDropContext } from 'react-beautiful-dnd'; import { DragDropContext } from 'react-beautiful-dnd';
@ -62,7 +62,7 @@ const LoggedInView = React.createClass({
displayName: 'LoggedInView', displayName: 'LoggedInView',
propTypes: { propTypes: {
matrixClient: PropTypes.instanceOf(Matrix.MatrixClient).isRequired, matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
page_type: PropTypes.string.isRequired, page_type: PropTypes.string.isRequired,
onRoomCreated: PropTypes.func, onRoomCreated: PropTypes.func,
@ -78,7 +78,7 @@ const LoggedInView = React.createClass({
}, },
childContextTypes: { childContextTypes: {
matrixClient: PropTypes.instanceOf(Matrix.MatrixClient), matrixClient: PropTypes.instanceOf(MatrixClient),
authCache: PropTypes.object, authCache: PropTypes.object,
}, },

4
src/components/structures/MyGroups.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 { MatrixClient } from 'matrix-js-sdk';
import sdk from '../../index'; import sdk from '../../index';
import { _t } from '../../languageHandler'; import { _t } from '../../languageHandler';
import dis from '../../dispatcher'; import dis from '../../dispatcher';
import AccessibleButton from '../views/elements/AccessibleButton'; import AccessibleButton from '../views/elements/AccessibleButton';
import * as Matrix from "matrix-js-sdk";
export default React.createClass({ export default React.createClass({
displayName: 'MyGroups', displayName: 'MyGroups',
@ -34,7 +34,7 @@ export default React.createClass({
}, },
contextTypes: { contextTypes: {
matrixClient: PropTypes.instanceOf(Matrix.MatrixClient).isRequired, matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
}, },
componentWillMount: function() { componentWillMount: function() {

4
src/components/views/groups/GroupMemberTile.js
View File

@ -18,10 +18,10 @@ limitations under the License.
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { MatrixClient } from 'matrix-js-sdk';
import sdk from '../../../index'; import sdk from '../../../index';
import dis from '../../../dispatcher'; import dis from '../../../dispatcher';
import { GroupMemberType } from '../../../groups'; import { GroupMemberType } from '../../../groups';
import * as Matrix from "matrix-js-sdk";
export default React.createClass({ export default React.createClass({
displayName: 'GroupMemberTile', displayName: 'GroupMemberTile',
@ -36,7 +36,7 @@ export default React.createClass({
}, },
contextTypes: { contextTypes: {
matrixClient: PropTypes.instanceOf(Matrix.MatrixClient).isRequired, matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
}, },
onClick: function(e) { onClick: function(e) {

4
src/components/views/rooms/EventTile.js
View File

@ -32,7 +32,7 @@ const TextForEvent = require('../../../TextForEvent');
import dis from '../../../dispatcher'; import dis from '../../../dispatcher';
import SettingsStore from "../../../settings/SettingsStore"; import SettingsStore from "../../../settings/SettingsStore";
import {EventStatus, default as Matrix} from 'matrix-js-sdk'; import {EventStatus, MatrixClient} from 'matrix-js-sdk';
const ObjectUtils = require('../../../ObjectUtils'); const ObjectUtils = require('../../../ObjectUtils');
@ -189,7 +189,7 @@ module.exports = React.createClass({
}, },
contextTypes: { contextTypes: {
matrixClient: PropTypes.instanceOf(Matrix.MatrixClient).isRequired, matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
}, },
componentWillMount: function() { componentWillMount: function() {

6
src/components/views/rooms/MemberInfo.js
View File

@ -30,6 +30,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 { MatrixClient } from 'matrix-js-sdk';
import dis from '../../../dispatcher'; import dis from '../../../dispatcher';
import Modal from '../../../Modal'; import Modal from '../../../Modal';
import sdk from '../../../index'; import sdk from '../../../index';
@ -45,7 +46,6 @@ import MultiInviter from "../../../utils/MultiInviter";
import SettingsStore from "../../../settings/SettingsStore"; import SettingsStore from "../../../settings/SettingsStore";
import E2EIcon from "./E2EIcon"; import E2EIcon from "./E2EIcon";
import AutoHideScrollbar from "../../structures/AutoHideScrollbar"; import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
import * as Matrix from "matrix-js-sdk";
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'MemberInfo', displayName: 'MemberInfo',
@ -72,7 +72,7 @@ module.exports = React.createClass({
}, },
contextTypes: { contextTypes: {
matrixClient: PropTypes.instanceOf(Matrix.MatrixClient).isRequired, matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
}, },
componentWillMount: function() { componentWillMount: function() {
@ -981,8 +981,6 @@ module.exports = React.createClass({
</div>; </div>;
} }
const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper");
let backButton; let backButton;
if (this.props.member.roomId) { if (this.props.member.roomId) {
backButton = (<AccessibleButton className="mx_MemberInfo_cancel" backButton = (<AccessibleButton className="mx_MemberInfo_cancel"