Merge branch 'master' of github.com:nigelm/exim-website

diff --git a/script/gen.pl b/script/gen.pl
index 3c1137bce534eee1fa487179a576bddfb0cf2023..76734bf1bfa1ebd2d084a93d8aa1c729233052e3 100755 (executable)
--- a/script/gen.pl
+++ b/script/gen.pl
@@ -369,7 +369,7 @@ sub parse_arguments {
     error_help('Excess arguments') if ( scalar(@ARGV) );
 
     error_help('Must include at least one of --web, --spec or --filter')
-      unless ( defined $opt{web} || scalar( @{ $opt{spec} } ) || scalar( @{ $opt{web} } ) );
+      unless ( $opt{web} || scalar( @{ $opt{spec} || [] } ) || scalar( @{ $opt{filter} || [] } ) );
 
     return %opt;
 }

diff --git a/templates/web/doc/chapter.js b/templates/web/doc/chapter.js
index 1e81a848afef053a3bab27405caeb19e37f11eaa..988bf6a45ecf1c3911806577c89d3f4c60c1a846 100644 (file)
--- a/templates/web/doc/chapter.js
+++ b/templates/web/doc/chapter.js
@@ -47,7 +47,7 @@
             $ul.removeClass('hidden').css('visibility', 'hidden').appendTo('#toc').css('left', '-' + $ul.width() + 'px').css('visibility', 'visible');
             $('#toc > img').mousedown(click_func);
             $('#toc > ul').click(click_func);
-            $('#toc a').click(function (e) {
+            $('#toc, #toc a').click(function (e) {
                 e.stopPropagation()
             });
         });