imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

Browse source
This commit is contained in:
Travis Ralston 2020-01-09 14:15:09 -07:00
commit fde32f13a5
190 changed files with 6185 additions and 2225 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/stores/RightPanelStore.js
View file

@ -154,7 +154,7 @@ export default class RightPanelStore extends Store {
});
}
} else {
if (targetPhase === this._state.lastRoomPhase) {
if (targetPhase === this._state.lastRoomPhase && !payload.refireParams) {
this._setState({
showRoomPanel: !this._state.showRoomPanel,
});

9
src/stores/TagOrderStore.js
View file

@ -141,8 +141,13 @@ class TagOrderStore extends Store {
newTags = [...this._state.selectedTags, payload.tag];
}
} else {
// Select individual tag
newTags = [payload.tag];
if (this._state.selectedTags.length === 1 && this._state.selectedTags.includes(payload.tag)) {
// Existing (only) selected tag is being normally clicked again, clear tags
newTags = [];
} else {
// Select individual tag
newTags = [payload.tag];
}
}
// Only set the anchor tag if the tag was previously unselected, otherwise
// the next range starts with an unselected tag.