gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PushRules settings: Display keywords in alphabetical order

This commit is contained in:
manuroe 2016-01-14 11:15:59 +01:00
parent 0577edb055
commit 378f4bb85c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/views/settings/Notifications.js
View File

@ -59,9 +59,6 @@ module.exports = React.createClass({
}; };
}, },
keywordsDialogDiv: "",
newKeywords: undefined,
componentWillMount: function() { componentWillMount: function() {
this._refreshFromServer(); this._refreshFromServer();
}, },
@ -170,7 +167,6 @@ module.exports = React.createClass({
onKeywordsClicked: function(event) { onKeywordsClicked: function(event) {
var self = this; var self = this;
this.newKeywords = undefined;
// Compute the keywords list to display // Compute the keywords list to display
var keywords = []; var keywords = [];
@ -179,6 +175,10 @@ module.exports = React.createClass({
keywords.push(rule.pattern); keywords.push(rule.pattern);
} }
if (keywords.length) { if (keywords.length) {
// As keeping the order of per-word push rules hs side is a bit tricky to code,
// display the keywords in alphabetical order to the user
keywords.sort();
keywords = keywords.join(", "); keywords = keywords.join(", ");
} }
else { else {