From a695b5b2f8876873e934f8ad3410eb92be3c6fe1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Jun 2011 19:15:06 -0400 Subject: [PATCH] updated jquery and made it its own underlay --- IkiWiki/Plugin/openid.pm | 1 + debian/changelog | 1 + debian/copyright | 5 +-- templates/openid-selector.tmpl | 2 +- underlays/jquery/ikiwiki/jquery.min.js | 23 +++++++++++++ .../openid-selector/ikiwiki/openid/jquery.js | 32 ------------------- 6 files changed, 29 insertions(+), 35 deletions(-) create mode 100644 underlays/jquery/ikiwiki/jquery.min.js delete mode 100644 underlays/openid-selector/ikiwiki/openid/jquery.js diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index bd2cfdc44..b6642619a 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -8,6 +8,7 @@ use IkiWiki 3.00; sub import { add_underlay("openid-selector"); + add_underlay("jquery"); hook(type => "checkconfig", id => "openid", call => \&checkconfig); hook(type => "getsetup", id => "openid", call => \&getsetup); hook(type => "auth", id => "openid", call => \&auth); diff --git a/debian/changelog b/debian/changelog index 4fe011f4a..cb0ee6856 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ikiwiki (3.20110609) UNRELEASED; urgency=low * userlist: New plugin, lets admins see a list of users and their info. * aggregate: Improve checking for too long aggregated filenames. + * Updated to jQuery 1.6.1. -- Joey Hess Thu, 09 Jun 2011 10:06:44 -0400 diff --git a/debian/copyright b/debian/copyright index 16e0b3583..0571bdf8e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -203,8 +203,9 @@ Comment: From http://code.google.com/p/openid-selector/ License: BSD-2-clause -Files: underlays/openid-selector/ikiwiki/openid/jquery.js -Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer +Files: underlays/jquery/* +Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer + © 2011 The Dojo Foundation License: GPL-2 Files: underlays/attachments/ikiwiki/ diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl index 0659ee583..b6be2720c 100644 --- a/templates/openid-selector.tmpl +++ b/templates/openid-selector.tmpl @@ -1,4 +1,4 @@ - +