From c548a6a39c38618fdb7987402f8c6c34e667b0a5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 9 Jan 2013 23:47:24 -0400
Subject: [PATCH] webapp: Adjust longpoll code to work with recent versions of
 shakespeare-js.

A while ago I added code to support recent versions of shakespeare-js,
(commit fe11b3a940dc37031fda03e5f6c8a719f2e75322). But it seems that resulted
in quoting of all strings inserted into javascript files, which means it's
now impossible to do the type of metaprogramming that longpolling.julius
relied on. I have found another way to accomplish the same thing without
needing to generate unique function names. Hopefully it's portable.

Opinion of shakespeare-js now at rock bottom. One of these days, this
needs to be redone to use Fay.
---
 debian/changelog                                  |  2 ++
 ..._requires_reload_for_notification_bubbles.mdwn | 10 ++++++++++
 templates/notifications/longpolling.julius        | 15 +++++++--------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2df17e2bcd..b333cc1601 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ git-annex (3.20130108) UNRELEASED; urgency=low
   * webapp: Use IP address, rather than localhost, since some systems may
     have configuration problems or other issues that prevent web browsers
     from connecting to the right localhost IP for the webapp.
+  * webapp: Adjust longpoll code to work with recent versions of
+    shakespeare-js.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 08 Jan 2013 12:37:38 -0400
 
diff --git a/doc/bugs/webapp_requires_reload_for_notification_bubbles.mdwn b/doc/bugs/webapp_requires_reload_for_notification_bubbles.mdwn
index 92c32cdc75..d33e2c86b5 100644
--- a/doc/bugs/webapp_requires_reload_for_notification_bubbles.mdwn
+++ b/doc/bugs/webapp_requires_reload_for_notification_bubbles.mdwn
@@ -25,3 +25,13 @@ Please provide any additional information below.
 Javascript console error log says "Syntax error on localhost:5" which is this line:
 
     <link rel="stylesheet" href="/static/css/bootstrap.css"><link rel="stylesheet" href="/static/css/bootstrap-responsive.css"><style>body{padding-top:60px;padding-bottom:40px}.sidebar-nav{padding:9px 0}</style><script src="/static/jquery.full.js"></script><script src="/static/js/bootstrap-dropdown.js"></script><script src="/static/js/bootstrap-modal.js"></script><script src="/static/js/bootstrap-collapse.js"></script><script src="/static/longpolling.js"></script><script>function longpoll_"sidebar"() {
+
+> And the bug is the quoting inside the function name.
+> 
+> I believe this affects all builds done using shakespeare-js 1.0.0.2.
+> It may be that some browsers manage to run the javascript despite the
+> quoting. Otherwise, I don't know why noone has reported this bug
+> before now.
+> 
+> I've fixed this bug in git. Your testing with tomorrow's
+> autobuild would be appreciated. [[done]] --[[Joey]]
diff --git a/templates/notifications/longpolling.julius b/templates/notifications/longpolling.julius
index affa50cc81..2991c208fe 100644
--- a/templates/notifications/longpolling.julius
+++ b/templates/notifications/longpolling.julius
@@ -1,12 +1,11 @@
-function longpoll_#{ident}() {
-	longpoll(longpoll_#{ident}_url, '#{ident}'
-		, function() { setTimeout(longpoll_#{ident}, #{delay}); }
-		, function() { webapp_disconnected(); }
-	);
-}
 $(function() {
 	$.get("@{geturl}", function(url){
-		longpoll_#{ident}_url = url;
-		setTimeout(longpoll_#{ident}, #{startdelay});
+		var f = function() {
+			longpoll(url, '#{ident}'
+				, function() { setTimeout(f, #{delay}); }
+				, function() { webapp_disconnected(); }
+			);	
+		};
+		setTimeout(f, #{startdelay});
 	});
 });