Browse Source

More notifications fixes

Fix another thing I broke during the refactor
pull/1399/head
Richard van der Hoff 6 years ago
parent
commit
5450223cc7
  1. 4
      src/components/views/settings/Notifications.js
  2. 21
      src/notifications/PushRuleVectorState.js

4
src/components/views/settings/Notifications.js

@ -497,8 +497,8 @@ module.exports = React.createClass({
// Translate the rule actions and its enabled value into vector state
var vectorState;
if (rule) {
for (var stateKey in PushRuleVectorState) {
var state = PushRuleVectorState[stateKey];
for (var stateKey in PushRuleVectorState.states) {
var state = PushRuleVectorState.states[stateKey];
var vectorStateToActions = ruleDefinition.vectorStateToActions[state];
if (!vectorStateToActions) {

21
src/notifications/PushRuleVectorState.js

@ -18,12 +18,7 @@ limitations under the License.
var StandardActions = require('./StandardActions');
/**
* Enum for state of a push rule as defined by the Vector UI.
* @readonly
* @enum {string}
*/
module.exports = {
var states = {
/** The push rule is disabled */
OFF: "off",
@ -33,6 +28,16 @@ module.exports = {
/** The user will receive push notification for this rule with sound and
highlight if this is legitimate */
LOUD: "loud",
};
module.exports = {
/**
* Enum for state of a push rule as defined by the Vector UI.
* @readonly
* @enum {string}
*/
states: states,
/**
* Convert a PushRuleVectorState to a list of actions
@ -78,3 +83,7 @@ module.exports = {
return stateKind;
},
};
for (var k in states) {
module.exports[k] = states[k];
};

Loading…
Cancel
Save