OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

turn off the placeholder drag & drop function to get an opinion from folks

pull/387/head
Matthew Hodgson 2015-11-13 23:51:40 +00:00
parent ca07c8f429
commit 063e387a65
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/skins/vector/views/molecules/RoomTile.js
View File

@ -43,9 +43,9 @@ var roomTileSource = {
originalList: props.roomSubList, originalList: props.roomSubList,
originalIndex: props.roomSubList.findRoomTile(props.room).index, originalIndex: props.roomSubList.findRoomTile(props.room).index,
targetList: props.roomSubList, // at first target is same as original targetList: props.roomSubList, // at first target is same as original
lastTargetRoom: null, // lastTargetRoom: null,
lastYOffset: null, // lastYOffset: null,
lastYDelta: null, // lastYDelta: null,
}; };
if (props.roomSubList.debug) console.log("roomTile beginDrag for " + item.room.roomId); if (props.roomSubList.debug) console.log("roomTile beginDrag for " + item.room.roomId);
@ -123,7 +123,7 @@ var roomTileTarget = {
hover: function(props, monitor) { hover: function(props, monitor) {
var item = monitor.getItem(); var item = monitor.getItem();
var off = monitor.getClientOffset(); //var off = monitor.getClientOffset();
// console.log("hovering on room " + props.room.roomId + ", isOver=" + monitor.isOver()); // console.log("hovering on room " + props.room.roomId + ", isOver=" + monitor.isOver());
//console.log("item.targetList=" + item.targetList + ", roomSubList=" + props.roomSubList); //console.log("item.targetList=" + item.targetList + ", roomSubList=" + props.roomSubList);
@ -150,7 +150,7 @@ var roomTileTarget = {
// stop us from flickering between our droptarget and the previous room. // stop us from flickering between our droptarget and the previous room.
// whenever the cursor changes direction we have to reset the flicker-damping. // whenever the cursor changes direction we have to reset the flicker-damping.
/*
var yDelta = off.y - item.lastYOffset; var yDelta = off.y - item.lastYOffset;
if ((yDelta > 0 && item.lastYDelta < 0) || if ((yDelta > 0 && item.lastYDelta < 0) ||
@ -170,6 +170,7 @@ var roomTileTarget = {
if (yDelta) item.lastYDelta = yDelta; if (yDelta) item.lastYDelta = yDelta;
item.lastYOffset = off.y; item.lastYOffset = off.y;
*/
} }
else if (switchedTarget) { else if (switchedTarget) {
if (!props.roomSubList.findRoomTile(item.room).room) { if (!props.roomSubList.findRoomTile(item.room).room) {
@ -216,10 +217,12 @@ var RoomTile = React.createClass({
// //console.log("room " + this.props.room.roomId + " has dropTarget clientOffset " + this.props.clientOffset.x + "," + this.props.clientOffset.y); // //console.log("room " + this.props.room.roomId + " has dropTarget clientOffset " + this.props.clientOffset.x + "," + this.props.clientOffset.y);
// } // }
/*
if (this.props.room._dragging) { if (this.props.room._dragging) {
var RoomDropTarget = sdk.getComponent("molecules.RoomDropTarget"); var RoomDropTarget = sdk.getComponent("molecules.RoomDropTarget");
return <RoomDropTarget placeholder={true}/>; return <RoomDropTarget placeholder={true}/>;
} }
*/
var myUserId = MatrixClientPeg.get().credentials.userId; var myUserId = MatrixClientPeg.get().credentials.userId;
var me = this.props.room.currentState.members[myUserId]; var me = this.props.room.currentState.members[myUserId];