summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authornickago <ngonella@calpoly.edu>2015-08-17 08:10:49 -0700
committernickago <ngonella@calpoly.edu>2015-08-17 08:10:49 -0700
commitfb9e891246db3b8b69e70697d29be5b36b8c7578 (patch)
treec1a7709f539bd7f1974a68fbfec5c264bce032df /web/react
parent63005366ade33e0c1509fc1517381279b6cbd9ee (diff)
downloadchat-fb9e891246db3b8b69e70697d29be5b36b8c7578.tar.gz
chat-fb9e891246db3b8b69e70697d29be5b36b8c7578.tar.bz2
chat-fb9e891246db3b8b69e70697d29be5b36b8c7578.zip
Added hardcoded firefox function
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/user_settings.jsx2
-rw-r--r--web/react/utils/utils.jsx6
2 files changed, 4 insertions, 4 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index ad7de40bf..66d8c9366 100644
--- a/web/react/components/user_settings.jsx
+++ b/web/react/components/user_settings.jsx
@@ -13,7 +13,7 @@ var assign = require('object-assign');
function getNotificationsStateFromStores() {
var user = UserStore.getCurrentUser();
- var soundNeeded = !utils.checkBrowserType('firefox');
+ var soundNeeded = !utils.isBrowserFirefox();
var sound = (!user.notify_props || user.notify_props.desktop_sound == undefined) ? "true" : user.notify_props.desktop_sound;
var desktop = (!user.notify_props || user.notify_props.desktop == undefined) ? "all" : user.notify_props.desktop;
var email = (!user.notify_props || user.notify_props.email == undefined) ? "true" : user.notify_props.email;
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index ba48f0b1b..bc1009135 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -124,7 +124,7 @@ module.exports.notifyMe = function(title, body, channel) {
}
module.exports.ding = function() {
- if (!module.exports.checkBrowserType('firefox')) {
+ if (!module.exports.isBrowserFirefox()) {
var audio = new Audio('/static/images/ding.mp3');
audio.play();
}
@@ -937,6 +937,6 @@ module.exports.generateId = function() {
return id;
};
-module.exports.checkBrowserType = function(browser) {
- return navigator && navigator.userAgent && navigator.userAgent.toLowerCase().indexOf(browser.toLowerCase()) > -1
+module.exports.isBrowserFirefox = function() {
+ return navigator && navigator.userAgent && navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
}