X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/01d61f72fed7ac041786ea69d1b080f45a4c49d1..cf587c2b629d47729fca9fbcdd4e3d10327699ca:/browser.plp?ds=inline

diff --git a/browser.plp b/browser.plp
index 0fc1627..a53f045 100644
--- a/browser.plp
+++ b/browser.plp
@@ -1,6 +1,4 @@
 <(common.inc.plp)><:
-use 5.010;
-use utf8;
 use List::Util qw(sum max first);
 no if $] >= 5.018, warnings => 'experimental::smartmatch';
 
@@ -82,32 +80,35 @@ 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
 	}
 	when (!m{ \A [a-z]\w+ (?:/\d[\d-]*\d)? \z }x) {
-		printf "<p>Invalid browser usage data request: <em>%s</em>",
-			'identifier must be alphanumeric name or <q>0</q>';
+		Alert([
+			'Invalid browser usage data request',
+			'Identifier must be alphanumeric name or <q>0</q>.',
+		]);
 	}
 	$canihas = do "data/browser/usage-$_.inc.pl" or do {
-		printf "<p>Browser usage data not found: <em>%s</em>", $@ || $!;
+		Alert('Browser usage data not found', $@ || $!);
 		break;
 	};
 	$usage = $_;
 	my $ref = $canihas->{-title} || 'unknown';
-	$ref = sprintf '<a href="%s">%s</a>', $_, $ref
+	$ref = showlink($ref, $_)
 		for $canihas->{-site} || $canihas->{-source} || ();
 	$ref .= " $_" for $canihas->{-date} || ();
 	print "\nwith $ref browser usage statistics";
@@ -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};
@@ -339,10 +349,10 @@ sub saytitlecol {
 		say '</p>';
 	}
 	printf 'Resources: %s.', join(', ', map {
-		sprintf '<a href="%s">%s</a>', EscapeHTML($_->{url}), EscapeHTML($_->{title})
+		showlink($_->{title}, $_->{url})
 	} @$_) for grep { @$_ } $row->{links} // ();
 	printf '<br>Parent feature: %s.', join(', ', map {
-		sprintf '<a href="%s">%s</a>', EscapeHTML("#$_"), $caniuse->{data}->{$_}->{title}
+		showlink($caniuse->{data}->{$_}->{title}, "#$_")
 	} $_) for $row->{parent} || ();
 	print '</div>';
 }
@@ -353,7 +363,7 @@ sub saystatuscol {
 
 	for ($row->{status}) {
 		my $cell = $_ // '-';
-		$cell = sprintf '<a href="%s">%s</a>', $_, $cell for $row->{spec} // ();
+		$cell = showlink($cell, $_) for $row->{spec} // ();
 		printf '<td title="%s" class="l %s">%s',
 			$caniuse->{statuses}->{$_}, $CSTATUS{$_} // '', $cell;
 	}
@@ -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(' ',