From b36390e1a85233acbc84249e5831d2aab19a0b7b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Nov 2010 01:40:42 -0400 Subject: [PATCH] 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. (cherry picked from commit 9744c11f806cc72436b1d7b813fc194136e60db0) Conflicts: debian/changelog --- debian/changelog | 8 ++++++++ underlays/openid-selector/ikiwiki/openid/openid-jquery.js | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 98d13376d..9a3e34d44 100644 --- 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 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 f22f5776a..c59be1edc 100644 --- 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); -- 2.39.2