updated jquery and made it its own underlay

master
Joey Hess 2011-06-15 19:15:06 -04:00
parent e2b43578a6
commit a695b5b2f8
6 changed files with 29 additions and 35 deletions

View File

@ -8,6 +8,7 @@ use IkiWiki 3.00;
sub import { sub import {
add_underlay("openid-selector"); add_underlay("openid-selector");
add_underlay("jquery");
hook(type => "checkconfig", id => "openid", call => \&checkconfig); hook(type => "checkconfig", id => "openid", call => \&checkconfig);
hook(type => "getsetup", id => "openid", call => \&getsetup); hook(type => "getsetup", id => "openid", call => \&getsetup);
hook(type => "auth", id => "openid", call => \&auth); hook(type => "auth", id => "openid", call => \&auth);

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ ikiwiki (3.20110609) UNRELEASED; urgency=low
* userlist: New plugin, lets admins see a list of users and their info. * userlist: New plugin, lets admins see a list of users and their info.
* aggregate: Improve checking for too long aggregated filenames. * aggregate: Improve checking for too long aggregated filenames.
* Updated to jQuery 1.6.1.
-- Joey Hess <joeyh@debian.org> Thu, 09 Jun 2011 10:06:44 -0400 -- Joey Hess <joeyh@debian.org> Thu, 09 Jun 2011 10:06:44 -0400

5
debian/copyright vendored
View File

@ -203,8 +203,9 @@ Comment:
From http://code.google.com/p/openid-selector/ From http://code.google.com/p/openid-selector/
License: BSD-2-clause License: BSD-2-clause
Files: underlays/openid-selector/ikiwiki/openid/jquery.js Files: underlays/jquery/*
Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
© 2011 The Dojo Foundation
License: GPL-2 License: GPL-2
Files: underlays/attachments/ikiwiki/ Files: underlays/attachments/ikiwiki/

View File

@ -1,4 +1,4 @@
<script type="text/javascript" src="ikiwiki/openid/jquery.js"></script> <script type="text/javascript" src="ikiwiki/jquery.min.js"></script>
<script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script> <script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long