diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js index cf1016698..7f59db7d7 100644 --- a/src/components/structures/LeftPanel.js +++ b/src/components/structures/LeftPanel.js @@ -19,7 +19,6 @@ limitations under the License. import React from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import { DragDropContext } from 'react-beautiful-dnd'; import { MatrixClient } from 'matrix-js-sdk'; import { KeyCode } from 'matrix-react-sdk/lib/Keyboard'; import sdk from 'matrix-react-sdk'; @@ -27,8 +26,6 @@ import dis from 'matrix-react-sdk/lib/dispatcher'; import VectorConferenceHandler from '../../VectorConferenceHandler'; import SettingsStore from 'matrix-react-sdk/lib/settings/SettingsStore'; -import TagOrderActions from 'matrix-react-sdk/lib/actions/TagOrderActions'; -import RoomListActions from 'matrix-react-sdk/lib/actions/RoomListActions'; var LeftPanel = React.createClass({ @@ -170,47 +167,6 @@ var LeftPanel = React.createClass({ this.setState({ searchFilter: term }); }, - onDragEnd: function(result) { - // Dragged to an invalid destination, not onto a droppable - if (!result.destination) { - return; - } - - const dest = result.destination.droppableId; - - if (dest === 'tag-panel-droppable') { - // Dispatch synchronously so that the TagPanel receives an - // optimistic update from TagOrderStore before the previous - // state is shown. - dis.dispatch(TagOrderActions.moveTag( - this.context.matrixClient, - result.draggableId, - result.destination.index, - ), true); - } else { - this.onRoomTileEndDrag(result); - } - }, - - onRoomTileEndDrag: function(result) { - let newTag = result.destination.droppableId.split('_')[1]; - let prevTag = result.source.droppableId.split('_')[1]; - if (newTag === 'undefined') newTag = undefined; - if (prevTag === 'undefined') prevTag = undefined; - - const roomId = result.draggableId.split('_')[1]; - - const oldIndex = result.source.index; - const newIndex = result.destination.index; - - dis.dispatch(RoomListActions.tagRoom( - this.context.matrixClient, - this.context.matrixClient.getRoom(roomId), - prevTag, newTag, - oldIndex, newIndex, - ), true); - }, - collectRoomList: function(ref) { this._roomList = ref; }, @@ -250,21 +206,19 @@ var LeftPanel = React.createClass({ ); return ( - -
- { tagPanel } - -
-
+
+ { tagPanel } + +
); } }); diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss b/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss index 3fa861331..3de9ecf42 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss +++ b/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss @@ -115,6 +115,10 @@ limitations under the License. cursor: pointer; } +.mx_GroupTile_avatar { + cursor: -webkit-grab; +} + .mx_GroupTile_profile { margin-left: 10px; display: flex;