- { roomStores.map((roomStore, i) => {
- if (roomStore) {
- const isActive = roomStore === this.state.activeRoomStore;
- const tileClasses = classNames({
- "mx_GroupGridView_tile": true,
- "mx_GroupGridView_activeTile": isActive,
- });
- return ( {this._setActive(i);}}
- key={roomStore.getRoomId()}
- className={tileClasses}
- >
- );
- } else {
- return ({_t("No room in this tile yet.")} );
- }
- }) }
-
-
@@ -1610,7 +1610,6 @@ module.exports = React.createClass({
- );
- }
return
diff --git a/src/components/views/right_panel/HeaderButtons.js b/src/components/views/right_panel/HeaderButtons.js
index 3f5f58121d..f0479eb8be 100644
--- a/src/components/views/right_panel/HeaderButtons.js
+++ b/src/components/views/right_panel/HeaderButtons.js
@@ -78,6 +78,7 @@ export default class HeaderButtons extends React.Component {
// till show_right_panel, just without the fromHeader flag
// as that would hide the right panel again
dis.dispatch(Object.assign({}, payload, {fromHeader: false}));
+
}
this.setState({
phase: payload.phase,
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 2b50ff5e48..6a796bc160 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -39,6 +39,7 @@ import Unread from '../../../Unread';
import { findReadReceiptFromUserId } from '../../../utils/Receipt';
import withMatrixClient from '../../../wrappers/withMatrixClient';
import AccessibleButton from '../elements/AccessibleButton';
+import RoomViewStore from '../../../stores/RoomViewStore';
import SdkConfig from '../../../SdkConfig';
import MultiInviter from "../../../utils/MultiInviter";
import SettingsStore from "../../../settings/SettingsStore";
@@ -49,7 +50,6 @@ module.exports = withMatrixClient(React.createClass({
propTypes: {
matrixClient: PropTypes.object.isRequired,
member: PropTypes.object.isRequired,
- roomId: PropTypes.string,
},
getInitialState: function() {
@@ -713,7 +713,7 @@ module.exports = withMatrixClient(React.createClass({
}
if (!member || !member.membership || member.membership === 'leave') {
- const roomId = member && member.roomId ? member.roomId : this.props.roomId;
+ const roomId = member && member.roomId ? member.roomId : RoomViewStore.getRoomId();
const onInviteUserButton = async () => {
try {
// We use a MultiInviter to re-use the invite logic, even though
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index c648ca615b..91ef549185 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -22,6 +22,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
import Modal from '../../../Modal';
import sdk from '../../../index';
import dis from '../../../dispatcher';
+import RoomViewStore from '../../../stores/RoomViewStore';
import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
import Stickerpicker from './Stickerpicker';
import { makeRoomPermalink } from '../../../matrix-to';
@@ -62,7 +63,7 @@ export default class MessageComposer extends React.Component {
isRichTextEnabled: SettingsStore.getValue('MessageComposerInput.isRichTextEnabled'),
},
showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'),
- isQuoting: Boolean(this.props.roomViewStore.getQuotingEvent()),
+ isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
tombstone: this._getRoomTombstone(),
};
}
@@ -74,7 +75,7 @@ export default class MessageComposer extends React.Component {
// XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something.
MatrixClientPeg.get().on("event", this.onEvent);
MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents);
- this._roomStoreToken = this.props.roomViewStore.addListener(this._onRoomViewStoreUpdate);
+ this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
this._waitForOwnMember();
}
@@ -123,14 +124,14 @@ export default class MessageComposer extends React.Component {
}
_onRoomViewStoreUpdate() {
- const isQuoting = Boolean(this.props.roomViewStore.getQuotingEvent());
+ const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
if (this.state.isQuoting === isQuoting) return;
this.setState({ isQuoting });
}
onUploadClick(ev) {
if (MatrixClientPeg.get().isGuest()) {
- this.props.roomViewStore.getDispatcher().dispatch({action: 'require_registration'});
+ dis.dispatch({action: 'require_registration'});
return;
}
@@ -164,7 +165,7 @@ export default class MessageComposer extends React.Component {
}
}
- const isQuoting = Boolean(this.props.roomViewStore.getQuotingEvent());
+ const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
let replyToWarning = null;
if (isQuoting) {
replyToWarning =
diff --git a/src/components/views/right_panel/HeaderButtons.js b/src/components/views/right_panel/HeaderButtons.js
index 3f5f58121d..f0479eb8be 100644
--- a/src/components/views/right_panel/HeaderButtons.js
+++ b/src/components/views/right_panel/HeaderButtons.js
@@ -78,6 +78,7 @@ export default class HeaderButtons extends React.Component {
// till show_right_panel, just without the fromHeader flag
// as that would hide the right panel again
dis.dispatch(Object.assign({}, payload, {fromHeader: false}));
+
}
this.setState({
phase: payload.phase,
diff --git a/src/components/views/rooms/MemberInfo.js b/src/components/views/rooms/MemberInfo.js
index 2b50ff5e48..6a796bc160 100644
--- a/src/components/views/rooms/MemberInfo.js
+++ b/src/components/views/rooms/MemberInfo.js
@@ -39,6 +39,7 @@ import Unread from '../../../Unread';
import { findReadReceiptFromUserId } from '../../../utils/Receipt';
import withMatrixClient from '../../../wrappers/withMatrixClient';
import AccessibleButton from '../elements/AccessibleButton';
+import RoomViewStore from '../../../stores/RoomViewStore';
import SdkConfig from '../../../SdkConfig';
import MultiInviter from "../../../utils/MultiInviter";
import SettingsStore from "../../../settings/SettingsStore";
@@ -49,7 +50,6 @@ module.exports = withMatrixClient(React.createClass({
propTypes: {
matrixClient: PropTypes.object.isRequired,
member: PropTypes.object.isRequired,
- roomId: PropTypes.string,
},
getInitialState: function() {
@@ -713,7 +713,7 @@ module.exports = withMatrixClient(React.createClass({
}
if (!member || !member.membership || member.membership === 'leave') {
- const roomId = member && member.roomId ? member.roomId : this.props.roomId;
+ const roomId = member && member.roomId ? member.roomId : RoomViewStore.getRoomId();
const onInviteUserButton = async () => {
try {
// We use a MultiInviter to re-use the invite logic, even though
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index c648ca615b..91ef549185 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -22,6 +22,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
import Modal from '../../../Modal';
import sdk from '../../../index';
import dis from '../../../dispatcher';
+import RoomViewStore from '../../../stores/RoomViewStore';
import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
import Stickerpicker from './Stickerpicker';
import { makeRoomPermalink } from '../../../matrix-to';
@@ -62,7 +63,7 @@ export default class MessageComposer extends React.Component {
isRichTextEnabled: SettingsStore.getValue('MessageComposerInput.isRichTextEnabled'),
},
showFormatting: SettingsStore.getValue('MessageComposer.showFormatting'),
- isQuoting: Boolean(this.props.roomViewStore.getQuotingEvent()),
+ isQuoting: Boolean(RoomViewStore.getQuotingEvent()),
tombstone: this._getRoomTombstone(),
};
}
@@ -74,7 +75,7 @@ export default class MessageComposer extends React.Component {
// XXX: fragile as all hell - fixme somehow, perhaps with a dedicated Room.encryption event or something.
MatrixClientPeg.get().on("event", this.onEvent);
MatrixClientPeg.get().on("RoomState.events", this._onRoomStateEvents);
- this._roomStoreToken = this.props.roomViewStore.addListener(this._onRoomViewStoreUpdate);
+ this._roomStoreToken = RoomViewStore.addListener(this._onRoomViewStoreUpdate);
this._waitForOwnMember();
}
@@ -123,14 +124,14 @@ export default class MessageComposer extends React.Component {
}
_onRoomViewStoreUpdate() {
- const isQuoting = Boolean(this.props.roomViewStore.getQuotingEvent());
+ const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
if (this.state.isQuoting === isQuoting) return;
this.setState({ isQuoting });
}
onUploadClick(ev) {
if (MatrixClientPeg.get().isGuest()) {
- this.props.roomViewStore.getDispatcher().dispatch({action: 'require_registration'});
+ dis.dispatch({action: 'require_registration'});
return;
}
@@ -164,7 +165,7 @@ export default class MessageComposer extends React.Component {
}
}
- const isQuoting = Boolean(this.props.roomViewStore.getQuotingEvent());
+ const isQuoting = Boolean(RoomViewStore.getQuotingEvent());
let replyToWarning = null;
if (isQuoting) {
replyToWarning = {
@@ -228,7 +229,7 @@ export default class MessageComposer extends React.Component {
if (!call) {
return;
}
- this.props.roomViewStore.getDispatcher().dispatch({
+ dis.dispatch({
action: 'hangup',
// hangup the call for this room, which may not be the room in props
// (e.g. conferences which will hangup the 1:1 room instead)
@@ -237,7 +238,7 @@ export default class MessageComposer extends React.Component {
}
onCallClick(ev) {
- this.props.roomViewStore.getDispatcher().dispatch({
+ dis.dispatch({
action: 'place_call',
type: ev.shiftKey ? "screensharing" : "video",
room_id: this.props.room.roomId,
@@ -245,7 +246,7 @@ export default class MessageComposer extends React.Component {
}
onVoiceCallClick(ev) {
- this.props.roomViewStore.getDispatcher().dispatch({
+ dis.dispatch({
action: 'place_call',
type: "voice",
room_id: this.props.room.roomId,
@@ -287,8 +288,7 @@ export default class MessageComposer extends React.Component {
const createEvent = replacementRoom.currentState.getStateEvents('m.room.create', '');
if (createEvent && createEvent.getId()) createEventId = createEvent.getId();
}
-
- this.props.roomViewStore.getDispatcher().dispatch({
+ dis.dispatch({
action: 'view_room',
highlighted: true,
event_id: createEventId,
@@ -432,10 +432,8 @@ export default class MessageComposer extends React.Component {
controls.push(
- ;
}
- let toggleRightPanelButton;
- if (this.props.isGrid) {
- toggleRightPanelButton =
-
);
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 1f9c0c1523..1a17fcf5ea 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -29,6 +29,7 @@ import * as RoomNotifs from '../../../RoomNotifs';
import * as FormattingUtils from '../../../utils/FormattingUtils';
import AccessibleButton from '../elements/AccessibleButton';
import ActiveRoomObserver from '../../../ActiveRoomObserver';
+import RoomViewStore from '../../../stores/RoomViewStore';
import SettingsStore from "../../../settings/SettingsStore";
module.exports = React.createClass({
@@ -61,7 +62,7 @@ module.exports = React.createClass({
roomName: this.props.room.name,
notifState: RoomNotifs.getRoomNotifsState(this.props.room.roomId),
notificationCount: this.props.room.getUnreadNotificationCount(),
- selected: this.props.room.roomId === ActiveRoomObserver.getActiveRoomId(),
+ selected: this.props.room.roomId === RoomViewStore.getRoomId(),
statusMessage: this._getStatusMessage(),
});
},
@@ -150,9 +151,9 @@ module.exports = React.createClass({
}
},
- _onActiveRoomChange: function(activeRoomId) {
+ _onActiveRoomChange: function() {
this.setState({
- selected: this.props.room.roomId === activeRoomId,
+ selected: this.props.room.roomId === RoomViewStore.getRoomId(),
});
},
diff --git a/src/dispatcher.js b/src/dispatcher.js
index 4dc6e1e37d..48c8dc86e9 100644
--- a/src/dispatcher.js
+++ b/src/dispatcher.js
@@ -17,10 +17,42 @@ limitations under the License.
'use strict';
-import MatrixDispatcher from "./matrix-dispatcher";
+const flux = require("flux");
+
+class MatrixDispatcher extends flux.Dispatcher {
+ /**
+ * @param {Object|function} payload Required. The payload to dispatch.
+ * If an Object, must contain at least an 'action' key.
+ * If a function, must have the signature (dispatch) => {...}.
+ * @param {boolean=} sync Optional. Pass true to dispatch
+ * synchronously. This is useful for anything triggering
+ * an operation that the browser requires user interaction
+ * for.
+ */
+ dispatch(payload, sync) {
+ // Allow for asynchronous dispatching by accepting payloads that have the
+ // type `function (dispatch) {...}`
+ if (typeof payload === 'function') {
+ payload((action) => {
+ this.dispatch(action, sync);
+ });
+ return;
+ }
+
+ if (sync) {
+ super.dispatch(payload);
+ } else {
+ // Unless the caller explicitly asked for us to dispatch synchronously,
+ // we always set a timeout to do this: The flux dispatcher complains
+ // if you dispatch from within a dispatch, so rather than action
+ // handlers having to worry about not calling anything that might
+ // then dispatch, we just do dispatches asynchronously.
+ setTimeout(super.dispatch.bind(this, payload), 0);
+ }
+ }
+}
if (global.mxDispatcher === undefined) {
global.mxDispatcher = new MatrixDispatcher();
}
-
module.exports = global.mxDispatcher;
diff --git a/src/matrix-dispatcher.js b/src/matrix-dispatcher.js
deleted file mode 100644
index fb81ed837f..0000000000
--- a/src/matrix-dispatcher.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-'use strict';
-
-const flux = require("flux");
-
-export default class MatrixDispatcher extends flux.Dispatcher {
- /**
- * @param {Object|function} payload Required. The payload to dispatch.
- * If an Object, must contain at least an 'action' key.
- * If a function, must have the signature (dispatch) => {...}.
- * @param {boolean=} sync Optional. Pass true to dispatch
- * synchronously. This is useful for anything triggering
- * an operation that the browser requires user interaction
- * for.
- */
- dispatch(payload, sync) {
- // Allow for asynchronous dispatching by accepting payloads that have the
- // type `function (dispatch) {...}`
- if (typeof payload === 'function') {
- payload((action) => {
- this.dispatch(action, sync);
- });
- return;
- }
-
- if (sync) {
- super.dispatch(payload);
- } else {
- // Unless the caller explicitly asked for us to dispatch synchronously,
- // we always set a timeout to do this: The flux dispatcher complains
- // if you dispatch from within a dispatch, so rather than action
- // handlers having to worry about not calling anything that might
- // then dispatch, we just do dispatches asynchronously.
- setTimeout(super.dispatch.bind(this, payload), 0);
- }
- }
-}
diff --git a/src/settings/Settings.js b/src/settings/Settings.js
index 836e906b6e..66353c67a6 100644
--- a/src/settings/Settings.js
+++ b/src/settings/Settings.js
@@ -110,12 +110,6 @@ export const SETTINGS = {
supportedLevels: LEVELS_FEATURE,
default: false,
},
- "feature_gridview": {
- isFeature: true,
- displayName: _td("Allow up to 6 rooms in a community to be shown simultaneously in a grid via the context menu"),
- supportedLevels: LEVELS_FEATURE,
- default: false,
- },
"MessageComposerInput.dontSuggestEmoji": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Disable Emoji suggestions while typing'),
diff --git a/src/stores/OpenRoomsStore.js b/src/stores/OpenRoomsStore.js
deleted file mode 100644
index 21f02fe28d..0000000000
--- a/src/stores/OpenRoomsStore.js
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
-Copyright 2018 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-import MatrixDispatcher from '../matrix-dispatcher';
-import dis from '../dispatcher';
-import {RoomViewStore} from './RoomViewStore';
-import GroupStore from './GroupStore';
-import {Store} from 'flux/utils';
-import MatrixClientPeg from '../MatrixClientPeg';
-
-
-function matchesRoom(payload, roomStore) {
- if (!roomStore) {
- return false;
- }
- if (payload.room_alias) {
- return payload.room_alias === roomStore.getRoomAlias();
- }
- return payload.room_id === roomStore.getRoomId();
-}
-
-/**
- * A class for keeping track of the RoomViewStores of the rooms shown on the screen.
- * Routes the dispatcher actions to the store of currently active room.
- */
-class OpenRoomsStore extends Store {
- constructor() {
- super(dis);
-
- // Initialise state
- this._state = {
- rooms: [],
- currentIndex: null,
- group_id: null,
- };
-
- this._forwardingEvent = null;
- }
-
- getRoomStores() {
- return this._state.rooms.map((r) => r.store);
- }
-
- getActiveRoomStore() {
- const openRoom = this._getActiveOpenRoom();
- if (openRoom) {
- return openRoom.store;
- }
- }
-
- getRoomStoreAt(index) {
- if (index >= 0 && index < this._state.rooms.length) {
- return this._state.rooms[index].store;
- }
- }
-
- _getActiveOpenRoom() {
- const index = this._state.currentIndex;
- if (index !== null && index < this._state.rooms.length) {
- return this._state.rooms[index];
- }
- }
-
- _setState(newState) {
- this._state = Object.assign(this._state, newState);
- this.__emitChange();
- }
-
- _hasRoom(payload) {
- return this._roomIndex(payload) !== -1;
- }
-
- _roomIndex(payload) {
- return this._state.rooms.findIndex((r) => matchesRoom(payload, r.store));
- }
-
- _cleanupOpenRooms() {
- this._state.rooms.forEach((room) => {
- room.dispatcher.unregister(room.dispatcherRef);
- room.dispatcher.unregister(room.store.getDispatchToken());
- });
- this._setState({
- rooms: [],
- group_id: null,
- currentIndex: null,
- });
- }
-
- _createOpenRoom(roomId, roomAlias) {
- const dispatcher = new MatrixDispatcher();
- // forward all actions coming from the room dispatcher
- // to the global one
- const dispatcherRef = dispatcher.register((payload) => {
- // block a view_room action for the same room because it will switch to
- // single room mode in MatrixChat
- if (payload.action === 'view_room' && roomId === payload.room_id) {
- return;
- }
- payload.grid_src_room_id = roomId;
- payload.grid_src_room_alias = roomAlias;
- this.getDispatcher().dispatch(payload);
- });
- const openRoom = {
- store: new RoomViewStore(dispatcher),
- dispatcher,
- dispatcherRef,
- };
-
- dispatcher.dispatch({
- action: 'view_room',
- room_id: roomId,
- room_alias: roomAlias,
- }, true);
-
- return openRoom;
- }
-
- _setSingleOpenRoom(payload) {
- this._setState({
- rooms: [this._createOpenRoom(payload.room_id, payload.room_alias)],
- currentIndex: 0,
- });
- }
-
- _setGroupOpenRooms(groupId) {
- this._cleanupOpenRooms();
- // TODO: register to GroupStore updates
- const rooms = GroupStore.getGroupRooms(groupId);
- const openRooms = rooms.map((room) => {
- return this._createOpenRoom(room.roomId);
- });
- this._setState({
- rooms: openRooms,
- group_id: groupId,
- currentIndex: 0,
- });
- }
-
- _forwardAction(payload) {
- // don't forward an event to a room dispatcher
- // if the event originated from that dispatcher, as this
- // would cause the event to be observed twice in that
- // dispatcher
- if (payload.grid_src_room_id || payload.grid_src_room_alias) {
- const srcPayload = {
- room_id: payload.grid_src_room_id,
- room_alias: payload.grid_src_room_alias,
- };
- const srcIndex = this._roomIndex(srcPayload);
- if (srcIndex === this._state.currentIndex) {
- return;
- }
- }
- const currentRoom = this._getActiveOpenRoom();
- if (currentRoom) {
- currentRoom.dispatcher.dispatch(payload, true);
- }
- }
-
- async _resolveRoomAlias(payload) {
- try {
- const result = await MatrixClientPeg.get()
- .getRoomIdForAlias(payload.room_alias);
- this.getDispatcher().dispatch({
- action: 'view_room',
- room_id: result.room_id,
- event_id: payload.event_id,
- highlighted: payload.highlighted,
- room_alias: payload.room_alias,
- auto_join: payload.auto_join,
- oob_data: payload.oob_data,
- });
- } catch (err) {
- this._forwardAction({
- action: 'view_room_error',
- room_id: null,
- room_alias: payload.room_alias,
- err: err,
- });
- }
- }
-
- _viewRoom(payload) {
- console.log("!!! OpenRoomsStore: view_room", payload);
- if (!payload.room_id && payload.room_alias) {
- this._resolveRoomAlias(payload);
- }
- const currentStore = this.getActiveRoomStore();
- if (!matchesRoom(payload, currentStore)) {
- if (this._hasRoom(payload)) {
- const roomIndex = this._roomIndex(payload);
- this._setState({currentIndex: roomIndex});
- } else {
- this._cleanupOpenRooms();
- }
- }
- if (!this.getActiveRoomStore()) {
- console.log("OpenRoomsStore: _setSingleOpenRoom");
- this._setSingleOpenRoom(payload);
- }
- console.log("OpenRoomsStore: _forwardAction");
- this._forwardAction(payload);
- if (this._forwardingEvent) {
- this.getDispatcher().dispatch({
- action: 'send_event',
- room_id: payload.room_id,
- event: this._forwardingEvent,
- });
- this._forwardingEvent = null;
- }
- }
-
- __onDispatch(payload) {
- let proposedIndex;
- switch (payload.action) {
- // view_room:
- // - room_alias: '#somealias:matrix.org'
- // - room_id: '!roomid123:matrix.org'
- // - event_id: '$213456782:matrix.org'
- // - event_offset: 100
- // - highlighted: true
- case 'view_room':
- this._viewRoom(payload);
- break;
- case 'view_my_groups':
- case 'view_group':
- this._forwardAction(payload);
- this._cleanupOpenRooms();
- break;
- case 'will_join':
- case 'cancel_join':
- case 'join_room':
- case 'join_room_error':
- case 'on_logged_out':
- case 'reply_to_event':
- case 'open_room_settings':
- case 'close_settings':
- case 'focus_composer':
- this._forwardAction(payload);
- break;
- case 'forward_event':
- this._forwardingEvent = payload.event;
- break;
- case 'group_grid_set_active':
- proposedIndex = this._roomIndex(payload);
- if (proposedIndex !== -1) {
- this._setState({
- currentIndex: proposedIndex,
- });
- }
- break;
- case 'group_grid_view':
- if (payload.group_id !== this._state.group_id) {
- this._setGroupOpenRooms(payload.group_id);
- }
- break;
- }
- }
-}
-
-let singletonOpenRoomsStore = null;
-if (!singletonOpenRoomsStore) {
- singletonOpenRoomsStore = new OpenRoomsStore();
-}
-module.exports = singletonOpenRoomsStore;
diff --git a/src/stores/RoomViewStore.js b/src/stores/RoomViewStore.js
index a0b831ad17..9e048e5d8e 100644
--- a/src/stores/RoomViewStore.js
+++ b/src/stores/RoomViewStore.js
@@ -14,6 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
+import dis from '../dispatcher';
import {Store} from 'flux/utils';
import MatrixClientPeg from '../MatrixClientPeg';
import sdk from '../index';
@@ -52,12 +53,12 @@ const INITIAL_STATE = {
* with a subset of the js-sdk.
* ```
*/
-export class RoomViewStore extends Store {
- constructor(dispatcher) {
- super(dispatcher);
+class RoomViewStore extends Store {
+ constructor() {
+ super(dis);
// Initialise state
- this._state = Object.assign({}, INITIAL_STATE);
+ this._state = INITIAL_STATE;
}
_setState(newState) {
@@ -84,8 +85,6 @@ export class RoomViewStore extends Store {
});
break;
case 'view_room_error':
- // should not go over dispatcher anymore
- // but be internal to RoomViewStore
this._viewRoomError(payload);
break;
case 'will_join':
@@ -151,11 +150,22 @@ export class RoomViewStore extends Store {
// pull the user out of Room Settings
isEditingSettings: false,
};
+
+ if (this._state.forwardingEvent) {
+ dis.dispatch({
+ action: 'send_event',
+ room_id: newState.roomId,
+ event: this._state.forwardingEvent,
+ });
+ }
+
this._setState(newState);
+
if (payload.auto_join) {
this._joinRoom(payload);
}
} else if (payload.room_alias) {
+ // Resolve the alias and then do a second dispatch with the room ID acquired
this._setState({
roomId: null,
initialEventId: null,
@@ -165,6 +175,25 @@ export class RoomViewStore extends Store {
roomLoading: true,
roomLoadError: null,
});
+ MatrixClientPeg.get().getRoomIdForAlias(payload.room_alias).done(
+ (result) => {
+ dis.dispatch({
+ action: 'view_room',
+ room_id: result.room_id,
+ event_id: payload.event_id,
+ highlighted: payload.highlighted,
+ room_alias: payload.room_alias,
+ auto_join: payload.auto_join,
+ oob_data: payload.oob_data,
+ });
+ }, (err) => {
+ dis.dispatch({
+ action: 'view_room_error',
+ room_id: null,
+ room_alias: payload.room_alias,
+ err: err,
+ });
+ });
}
}
@@ -190,7 +219,7 @@ export class RoomViewStore extends Store {
// stream yet, and that's the point at which we'd consider
// the user joined to the room.
}, (err) => {
- this.getDispatcher().dispatch({
+ dis.dispatch({
action: 'join_room_error',
err: err,
});
@@ -306,7 +335,8 @@ export class RoomViewStore extends Store {
}
}
-const MatrixDispatcher = require("../matrix-dispatcher");
-const backwardsCompatInstance = new RoomViewStore(new MatrixDispatcher());
-
-export default backwardsCompatInstance;
+let singletonRoomViewStore = null;
+if (!singletonRoomViewStore) {
+ singletonRoomViewStore = new RoomViewStore();
+}
+module.exports = singletonRoomViewStore;
diff --git a/src/utils/Timer.js b/src/utils/Timer.js
index ca06237fbf..6d6dbb0996 100644
--- a/src/utils/Timer.js
+++ b/src/utils/Timer.js
@@ -26,6 +26,7 @@ Once a timer is finished or aborted, it can't be started again
a new one through `clone()` or `cloneIfRun()`.
*/
export default class Timer {
+
constructor(timeout) {
this._timeout = timeout;
this._onTimeout = this._onTimeout.bind(this);
@@ -439,8 +419,7 @@ module.exports = React.createClass({
{ saveButton }
{ cancelButton }
{ rightRow }
- { !this.props.isGrid ?