mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/i18n_analytics

Browse source
This commit is contained in:
Michael Telatynski 2017-07-28 21:02:48 +01:00
commit 5b6dbfb701
No known key found for this signature in database
GPG key ID: 0435A1D4BBD34D64
12 changed files with 196 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/RoomSubList.js
View file

@ -511,7 +511,7 @@ var RoomSubList = React.createClass({
if (list[i].tags[self.props.tagName] && list[i].tags[self.props.tagName].order === undefined) {
MatrixClientPeg.get().setRoomTag(list[i].roomId, self.props.tagName, {order: (order + 1.0) / 2.0}).finally(function() {
// Do any final stuff here
}).fail(function(err) {
}).catch(function(err) {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
console.error("Failed to add tag " + self.props.tagName + " to room" + err);
Modal.createTrackedDialog('Failed to add tag to room', err.toString(), ErrorDialog, {