browser: agent versions from appropriate index

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index a78e0ecab8f37c178bfa300ecc6b9a58b7473879..a53f0457bc6e27688ff7c7c9637087d2b3ed6b47 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -80,17 +80,18 @@ my %CSTATUS = (
        other => 'l0', # non-w3
 );
 my %versions;
-if (my ($somerow) = values %{ $caniuse->{data} }) {
-       while (my ($browser, $row) = each %{ $somerow->{stats} }) {
-               $versions{$browser} = [ sort { paddedver($a) cmp paddedver($b) } keys %$row ];
-       }
+while (my ($browser, $row) = each %{ $caniuse->{agents} }) {
+       $versions{$browser} = [
+               sort { paddedver($a) cmp paddedver($b) } grep { defined }
+               @{ $row->{versions} }
+       ];
 }
 
 print <<'';
 <p id="intro">Alternate rendition of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page
 
 my ($canihas, $usage);
-my $minusage = $get{threshold} // .7;
+my $minusage = $get{threshold} // 1;
 given ($get{usage} // 'wm') {
        when (!$_) {
                # none
@@ -311,6 +312,15 @@ sub formatnotes {
        return @html;
 }
 
+sub notestotitle {
+       my @notes = @_;
+       for (@notes) {
+               EscapeHTML($_);
+               s{ \[ ([^]]*) \] \( [^)]* \) }{$1}gx;  # strip link urls
+       }
+       return @notes;
+}
+
 sub saytitlecol {
        my ($id) = @_;
        my $row = $caniuse->{data}->{$id};
@@ -396,7 +406,7 @@ sub saybrowsercols {
                                map { split / /, $_ }
                                $prev
                        ));
-                       $title .= "\n".EscapeHTML($_) for @notes;
+                       $title .= "\n$_" for notestotitle(@notes);
 
                        printf('<td class="%s" colspan="%d" title="%s">%s',
                                join(' ',