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

newOrder defaults `null`, allows check for `newOrder` on line 357

pull/21833/head
lukebarnard 2018-01-19 14:12:21 +00:00
parent 54f6d305d7
commit 6106b3ce44
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,7 +310,7 @@ module.exports = React.createClass({
const hasChangedSubLists = result.source.droppableId !== result.destination.droppableId; const hasChangedSubLists = result.source.droppableId !== result.destination.droppableId;
const newOrder = {}; let newOrder = null;
// Is the tag ordered manually? // Is the tag ordered manually?
if (newTag && !newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) { if (newTag && !newTag.match(/^(m\.lowpriority|im\.vector\.fake\.(invite|recent|direct|archived))$/)) {
@ -327,7 +327,9 @@ module.exports = React.createClass({
const nextOrder = newIndex === newList.length ? const nextOrder = newIndex === newList.length ?
1 : newList[offset + newIndex].tags[newTag].order; 1 : newList[offset + newIndex].tags[newTag].order;
newOrder['order'] = (prevOrder + nextOrder) / 2.0; newOrder = {
order: (prevOrder + nextOrder) / 2.0,
};
} }
// More evilness: We will still be dealing with moving to favourites/low prio, // More evilness: We will still be dealing with moving to favourites/low prio,