Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
edfa3c1980
1 changed files with 1 additions and 4 deletions
|
@ -130,10 +130,7 @@ var roomTileSource = {
|
||||||
if (newTag && newTag !== 'im.vector.fake.direct' &&
|
if (newTag && newTag !== 'im.vector.fake.direct' &&
|
||||||
(item.targetList !== item.originalList || newOrder)
|
(item.targetList !== item.originalList || newOrder)
|
||||||
) {
|
) {
|
||||||
//component.state.set({ spinner: component.state.spinner ? component.state.spinner++ : 1 });
|
MatrixClientPeg.get().setRoomTag(item.room.roomId, newTag, newOrder).catch(function(err) {
|
||||||
MatrixClientPeg.get().setRoomTag(item.room.roomId, newTag, newOrder).finally(function() {
|
|
||||||
//component.state.set({ spinner: component.state.spinner-- });
|
|
||||||
}).fail(function(err) {
|
|
||||||
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
|
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
|
||||||
console.error("Failed to add tag " + newTag + " to room: " + err);
|
console.error("Failed to add tag " + newTag + " to room: " + err);
|
||||||
Modal.createDialog(ErrorDialog, {
|
Modal.createDialog(ErrorDialog, {
|
||||||
|
|
Loading…
Reference in a new issue