openid: Syntax tweak to the javascript code to make it work with MSIE 7 (and MSIE...

(cherry picked from commit 9744c11f806cc72436b1d7b813fc194136e60db0)

Conflicts:

	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 98d13376d138720bb030306243b69dbf9321e85b..9a3e34d44d43e58e7142aee15e2a58d480a458a5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ikiwiki (3.20100815.2) UNRELEASED; urgency=low
+
+  * openid: Syntax tweak to the javascript code to make it work with MSIE 7
+    (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting
+    the bug and providing access to debug it.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:42:55 -0400
+
 ikiwiki (3.20100815) unstable; urgency=medium
 
   * Fix po test suite to not assume ikiwiki's underlay is already installed.

diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index f22f5776a17713b7a5d05b93a2040b6eb393ef49..c59be1edc3e2538fe92b43df985e6f65c3f4ffab 100644 (file)
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -21,7 +21,7 @@ var providers_large = {
        icon: 'wikiicons/openidlogin-bg.gif',
         label: 'Enter your OpenID:',
         url: null
-    },
+    }
 };
 var providers_small = {
     livejournal: {
@@ -65,7 +65,7 @@ var providers_small = {
        icon: 'http://verisign.com/favicon.ico',
         label: 'Enter your Verisign username:',
         url: 'http://{username}.pip.verisignlabs.com/'
-    },
+    }
 };
 var providers = $.extend({}, providers_large, providers_small);