yetangitu/Jamstash
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'jerbob92/master' into develop-test

Browse source 
Conflicts:
	js/app.js
This commit is contained in:
Trevor Squillario 2014-04-05 12:53:24 -04:00
commit 8361a247ba
14 changed files with 768 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/controllers/settings.js
View file

@ -31,13 +31,13 @@ function SettingsCtrl($rootScope, $scope, $routeParams, $location, utils, global
if ($scope.settings.Password !== '' && globals.settings.Password.substring(0, 4) != 'enc:') { $scope.settings.Password = 'enc:' + utils.HexEncode($scope.settings.Password); }
if ($scope.settings.NotificationSong) {
notifications.requestPermissionIfRequired();
if (!notifications.hasNotificationPermission()) {
if (!notifications.hasNotificationSupport()) {
alert('HTML5 Notifications are not available for your current browser, Sorry :(');
}
}
if ($scope.settings.NotificationNowPlaying) {
notifications.requestPermissionIfRequired();
if (!notifications.hasNotificationPermission()) {
if (!notifications.hasNotificationSupport()) {
alert('HTML5 Notifications are not available for your current browser, Sorry :(');
}
}