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

4
src/components/views/context_menus/RoomTileContextMenu.js
View file

@ -68,7 +68,7 @@ module.exports = React.createClass({
if (self.props.onFinished) {
self.props.onFinished();
};
}).fail(function(err) {
}).catch(function(err) {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Failed to remove tag from room 1', err.toString(), ErrorDialog, {
title: _t('Failed to remove tag %(tagName)s from room', {tagName: tagNameOff}),
@ -85,7 +85,7 @@ module.exports = React.createClass({
if (self.props.onFinished) {
self.props.onFinished();
};
}).fail(function(err) {
}).catch(function(err) {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createTrackedDialog('Failed to remove tag from room 2', err.toString(), ErrorDialog, {
title: _t('Failed to remove tag %(tagName)s from room', {tagName: tagNameOn}),

2
src/components/views/rooms/DNDRoomTile.js
View file

@ -111,7 +111,7 @@ var roomTileSource = {
//component.state.set({ spinner: component.state.spinner ? component.state.spinner++ : 1 });
MatrixClientPeg.get().deleteRoomTag(item.room.roomId, prevTag).finally(function() {
//component.state.set({ spinner: component.state.spinner-- });
}).fail(function(err) {
}).catch(function(err) {
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
console.error("Failed to remove tag " + prevTag + " from room: " + err);
Modal.createTrackedDialog('Failed to remove tag from room', err.toString(), ErrorDialog, {