espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/4.1.6'

Browse Source
This commit is contained in:
yuri
2016-06-14 11:44:55 +03:00
parent fbb034ef92 6c9d1dbb3d
commit e638bf2eec
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/views/notification/badge.js
+5 -1
View File
@@ -50,7 +50,9 @@ Espo.define('views/notification/badge', 'view', function (Dep) {
},
setup: function () {
this.soundPath = this.getConfig().get('notificationSound') || this.soundPath;
this.soundPath = this.getBasePath() + (this.getConfig().get('notificationSound') || this.soundPath);
this.notificationSoundsDisabled = this.getConfig().get('notificationSoundsDisabled');
this.once('remove', function () {
if (this.timeout) {
@@ -105,6 +107,8 @@ Espo.define('views/notification/badge', 'view', function (Dep) {
},
playSound: function () {
if (this.notificationSoundsDisabled) return;
var html = '' +
'<audio autoplay="autoplay">'+
'<source src="' + this.soundPath + '.mp3" type="audio/mpeg" />'+
client/src/views/popup-notification.js
+2
View File
@@ -48,6 +48,8 @@ Espo.define('views/popup-notification', 'view', function (Dep) {
this.notificationSoundsDisabled = this.getConfig().get('notificationSoundsDisabled');
this.soundPath = this.getBasePath() + (this.getConfig().get('popupNotificationSound') || this.soundPath);
this.on('render', function () {
$(containerSelector).remove();