diff --git a/js/app.js b/js/app.js index 85633e6..69cc400 100755 --- a/js/app.js +++ b/js/app.js @@ -15,7 +15,6 @@ JamStash.service('globals', function (utils) { Password: "", Server: "", Timeout: 10000, - NotificationTimeout: 20000, Protocol: "jsonp", ApplicationName: "Jamstash", ApiVersion: "1.6.0", diff --git a/js/json_changelog.js b/js/json_changelog.js index 8d74dc8..f5fded2 100644 --- a/js/json_changelog.js +++ b/js/json_changelog.js @@ -2,7 +2,8 @@ { "date": "3/29/2014", "version": "3.3", "changes": [ - { "text": "- Queue opens in modal window, feels easier to use. Other bug fixes." } + { "text": "- Queue opens in modal window, feels easier to use. Other bug fixes." }, + { "text": "- Notifications support in Firefox via Notify.js. Thanks to jerbob92 https://github.com/tsquillario/Jamstash/pull/160" } ] }, { diff --git a/js/service.js b/js/service.js index 68cb6fb..748949c 100644 --- a/js/service.js +++ b/js/service.js @@ -145,7 +145,7 @@ JamStash.service('notifications', function ($rootScope, globals) { if (autohide) { setTimeout(function () { $(el).fadeOut(function () { $(this).remove(); }); - }, globals.settings.NotificationTimeout); + }, globals.settings.Timeout); } else { $(el).click(function () { $(el).fadeOut(function () { $(this).remove(); }); @@ -188,7 +188,7 @@ JamStash.service('notifications', function ($rootScope, globals) { notifications.push(notification); setTimeout(function (notWin) { notWin.close(); - }, globals.settings.NotificationTimeout, notification); + }, globals.settings.Timeout, notification); notification.show(); } else { console.log("showNotification: No Permission");