diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-18 11:39:18 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-18 11:39:18 -0400 |
| commit | 6d586c7309cb0ddaca6580dd1520aef4ff554fb5 (patch) | |
| tree | cba14cde1fca507b54438553534c28f4ff6a4e3d | |
| parent | 63273d6c164990f596ba72d87b1d566378a099f6 (diff) | |
| parent | f5a8703b38c380e1ea170328695b417098f08050 (diff) | |
| download | chat-6d586c7309cb0ddaca6580dd1520aef4ff554fb5.tar.gz chat-6d586c7309cb0ddaca6580dd1520aef4ff554fb5.tar.bz2 chat-6d586c7309cb0ddaca6580dd1520aef4ff554fb5.zip | |
Merge pull request #2472 from ZBoxApp/PLT-2392
PLT-2392: Fix for Notification sound broken
| -rw-r--r-- | webapp/utils/utils.jsx | 3 | ||||
| -rw-r--r-- | webapp/webpack.config.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index 12a7ff50e..95a0f99d5 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -20,6 +20,7 @@ import React from 'react'; import {FormattedTime} from 'react-intl'; import icon50 from 'images/icon50x50.png'; +import bing from 'images/bing.mp3'; export function isEmail(email) { // writing a regex to match all valid email addresses is really, really hard (see http://stackoverflow.com/a/201378) @@ -187,7 +188,7 @@ var canDing = true; export function ding() { if (!isBrowserFirefox() && canDing) { - var audio = new Audio('/static/images/bing.mp3'); + var audio = new Audio(bing); audio.play(); canDing = false; setTimeout(() => { diff --git a/webapp/webpack.config.js b/webapp/webpack.config.js index 4a21d44c7..ee5c7e70b 100644 --- a/webapp/webpack.config.js +++ b/webapp/webpack.config.js @@ -52,7 +52,7 @@ var config = { loaders: ['style', 'css'] }, { - test: /\.(png|eot|tiff|svg|woff2|woff|ttf|gif)$/, + test: /\.(png|eot|tiff|svg|woff2|woff|ttf|gif|mp3)$/, loader: 'file', query: { name: 'files/[hash].[ext]' |