[NEW] Configurable Volume for Notifications #6087 #7517
Conversation
|
|
# Conflicts: # .meteor/packages # package.json # packages/rocketchat-ui/client/lib/notification.js
# Conflicts: # .meteor/packages # package.json # packages/rocketchat-ui/client/lib/notification.js
…tions about changing user's password. #2995
lindoelio
changed the title
| @@ -397,7 +397,6 @@ class ModelUsers extends RocketChat.models._Base { | |||
| requirePasswordChangeReason | |||
| } | |||
| }; | |||
|
|
|||
There was a problem hiding this comment.
Please, do not introduce unnecessary changes
| @@ -70,7 +70,6 @@ RocketChat.settings.addGroup('Accounts', function() { | |||
| type: 'boolean', | |||
| 'public': true | |||
| }); | |||
|
|
|||
There was a problem hiding this comment.
Please, do not introduce unnecessary changes
| @@ -619,7 +619,7 @@ var jsc = { | |||
|
|
|||
| switch (controlName) { | |||
| case 'pad': | |||
| // if the slider is at the bottom, move it up | |||
There was a problem hiding this comment.
Why did you change these comments?
There was a problem hiding this comment.
Sorry. I've struggled by my find-replace :-) Fixed!
| @@ -872,6 +872,7 @@ | |||
| "Nothing_found": "No se encontró nada", | |||
| "Notification_Duration": "Duración de la notificación", | |||
| "Notifications": "Notificaciones", | |||
| "Notifications_Sound_Volume": "Notifications sound volume", | |||
.meteor/packages
Outdated
| @@ -173,3 +174,4 @@ yasinuslu:blaze-meta | |||
| deepwell:bootstrap-datepicker2 | |||
| rocketchat:postcss | |||
| dynamic-import@0.1.1 | |||
| fourseven:scss | |||
There was a problem hiding this comment.
We use only cssnext as CSS post-processor.
There was a problem hiding this comment.
Ok. SCSS removed.
| @@ -748,6 +748,7 @@ | |||
| "Nothing": "asgjë", | |||
| "Nothing_found": "Asgjë për të gjetur", | |||
| "Notifications": "Njoftime", | |||
| "Notifications_Sound_Volume": "Notifications sound volume", | |||
| @@ -58,7 +58,10 @@ this.visitor = new class { | |||
|
|
|||
| // notification sound | |||
| if (Session.equals('sound', true) && msg.u._id !== Meteor.userId()) { | |||
| $('#chatAudioNotification')[0].play(); | |||
| const audioVolume = Meteor.user().settings.preferences.notificationsSoundVolume || 100; | |||
| const audio = $('#chatAudioNotification')[0]; | |||
There was a problem hiding this comment.
you can use document.getElementById here, it's faster if you won't use jQuery.
There was a problem hiding this comment.
Thanks for your feedback. Fixed!
| @@ -0,0 +1,112 @@ | |||
| $shade-10: #04436a !default; | |||
There was a problem hiding this comment.
We don't use scss, just cssnext and less(we will remove all less styles in the future). You need to add your style on rocketchat-theme package and set your custom colors there on variables.js and colors.less files.
There was a problem hiding this comment.
Thanks for your feedback and explanation. I've done as you suggested. Fixed!
| * Input Range Slider | ||
| */ | ||
|
|
||
| .range-slider__range { |
There was a problem hiding this comment.
We already have classes for these colors, can you add those classes on your template?
| @@ -1,5 +1,6 @@ | |||
| /*globals defaultUserLanguage, KonchatNotification */ | |||
| import toastr from 'toastr'; | |||
|
|
|||
There was a problem hiding this comment.
can you remove that unnecessary change?
| @@ -0,0 +1,72 @@ | |||
| *, | |||
There was a problem hiding this comment.
we already have this selector on base.css file
| content: ''; | ||
| } | ||
|
|
||
| ::-moz-range-track { |
There was a problem hiding this comment.
can you make a selector that work only on the slider?
| border: 0; | ||
| } | ||
|
|
||
| input::-moz-focus-inner, |
There was a problem hiding this comment.
can you make a selector that work only on the slider?
| } | ||
|
|
||
| .range-slider__range::-webkit-slider-thumb { | ||
| -webkit-appearance: none; |
There was a problem hiding this comment.
we already use autoprefixer on css build, so you can remove these browser prefixes.
| height: 20px; | ||
| border-radius: 50%; | ||
| cursor: pointer; | ||
| -webkit-transition: background 0.15s ease-in-out; |
There was a problem hiding this comment.
we already use autoprefixer on css build, so you can remove these browser prefixes.
|
|
||
| .range-slider__range { | ||
| -webkit-appearance: none; | ||
| width: calc(100% - (73px)); |
There was a problem hiding this comment.
you can use calc(100% - 73px)
| } | ||
|
|
||
| .range-slider { | ||
| margin: 0 0 0 0%; |
| border: 0; | ||
| border-radius: 50%; | ||
| cursor: pointer; | ||
| -webkit-transition: background 0.15s ease-in-out; |
There was a problem hiding this comment.
we already use autoprefixer on css build, so you can remove these browser prefixes.
| let audio = $(e.currentTarget).data('play'); | ||
|
|
||
| if (!audio || audio === 'none') { | ||
| audio = Meteor.user().settings.preferences.newMessageNotification || 'chime'; |
There was a problem hiding this comment.
Meteor.user().settings or Meteor.user().settings.preferences can be undefined, can you check before?
| return audio && audio.play && audio.play(); | ||
|
|
||
| if (user && user.settings && user.settings.preferences) { | ||
| const newMessageNotification = user.settings.preferences.newMessageNotification || 'chime'; |
There was a problem hiding this comment.
If there is no user.settings.preferences then there will not have notifications?
| @@ -58,7 +58,10 @@ this.visitor = new class { | |||
|
|
|||
| // notification sound | |||
| if (Session.equals('sound', true) && msg.u._id !== Meteor.userId()) { | |||
| $('#chatAudioNotification')[0].play(); | |||
| const audioVolume = Meteor.user().settings.preferences.notificationsSoundVolume || 100; | |||
There was a problem hiding this comment.
Can you check the properties here too?
@RocketChat/core
Closes #6087