mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

webapp: More adjustments to longpoll code to deal with changes in variable quoting in different versions of shakespeare-js.

Browse source
This commit is contained in:
Joey Hess 2013-01-14 18:35:33 -04:00
parent 3bef53b0f7
commit 5a9f8acb99
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assistant/WebApp/Notifications.hs
View file

@ -39,7 +39,7 @@ autoUpdate tident geturl ms_delay ms_startdelay = do
#ifdef WITH_OLD_YESOD #ifdef WITH_OLD_YESOD
let delay = show ms_delay let delay = show ms_delay
let startdelay = show ms_startdelay let startdelay = show ms_startdelay
let ident = tident let ident = "'" ++ T.unpack tident ++ "'"
#else #else
let delay = Aeson.String (T.pack (show ms_delay)) let delay = Aeson.String (T.pack (show ms_delay))
let startdelay = Aeson.String (T.pack (show ms_startdelay)) let startdelay = Aeson.String (T.pack (show ms_startdelay))

7
debian/changelog vendored
View file

@ -1,3 +1,10 @@
git-annex (3.20130115) UNRELEASED; urgency=low
* webapp: More adjustments to longpoll code to deal with changes in
variable quoting in different versions of shakespeare-js.
-- Joey Hess <joeyh@debian.org> Mon, 14 Jan 2013 18:35:01 -0400
git-annex (3.20130114) unstable; urgency=low git-annex (3.20130114) unstable; urgency=low
* Now handles the case where a file that's being transferred to a remote * Now handles the case where a file that's being transferred to a remote

2
templates/notifications/longpolling.julius
View file

@ -1,7 +1,7 @@
$(function() { $(function() {
$.get("@{geturl}", function(url){ $.get("@{geturl}", function(url){
var f = function() { var f = function() {
longpoll(url, '#{ident}' longpoll(url, #{ident}
, function() { setTimeout(f, #{delay}); } , function() { setTimeout(f, #{delay}); }
, function() { webapp_disconnected(); } , function() { webapp_disconnected(); }
); );