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

rollover beta to prod, beta fixes

Browse source
This commit is contained in:
Trevor Squillario 2014-04-05 13:25:42 -04:00
parent 8361a247ba
commit c65bb06cb7
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/app.js
View file

@ -15,7 +15,6 @@ JamStash.service('globals', function (utils) {
Password: "", Password: "",
Server: "", Server: "",
Timeout: 10000, Timeout: 10000,
NotificationTimeout: 20000,
Protocol: "jsonp", Protocol: "jsonp",
ApplicationName: "Jamstash", ApplicationName: "Jamstash",
ApiVersion: "1.6.0", ApiVersion: "1.6.0",

3
js/json_changelog.js
View file

@ -2,7 +2,8 @@
{ {
"date": "3/29/2014", "version": "3.3", "date": "3/29/2014", "version": "3.3",
"changes": [ "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 <a href=\"https://github.com/alexgibson/notify.js\" target=\"_blank\">Notify.js</a>. Thanks to jerbob92 <a href=\"https://github.com/tsquillario/Jamstash/pull/160\" target=\"_blank\">https://github.com/tsquillario/Jamstash/pull/160</a>" }
] ]
}, },
{ {

4
js/service.js
View file

@ -145,7 +145,7 @@ JamStash.service('notifications', function ($rootScope, globals) {
if (autohide) { if (autohide) {
setTimeout(function () { setTimeout(function () {
$(el).fadeOut(function () { $(this).remove(); }); $(el).fadeOut(function () { $(this).remove(); });
}, globals.settings.NotificationTimeout); }, globals.settings.Timeout);
} else { } else {
$(el).click(function () { $(el).click(function () {
$(el).fadeOut(function () { $(this).remove(); }); $(el).fadeOut(function () { $(this).remove(); });
@ -188,7 +188,7 @@ JamStash.service('notifications', function ($rootScope, globals) {
notifications.push(notification); notifications.push(notification);
setTimeout(function (notWin) { setTimeout(function (notWin) {
notWin.close(); notWin.close();
}, globals.settings.NotificationTimeout, notification); }, globals.settings.Timeout, notification);
notification.show(); notification.show();
} else { } else {
console.log("showNotification: No Permission"); console.log("showNotification: No Permission");