X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/bac45e06a93a0aa666c6dfa3e312684f161e3952..6b44545759289f85e96c8c6b41501484374afa61:/browser.plp

diff --git a/browser.plp b/browser.plp
index d6291cb..13e6b5e 100644
--- a/browser.plp
+++ b/browser.plp
@@ -16,7 +16,7 @@ Html({
 :>
 <h1>Browser compatibility</h1>
 
-<p>Alternate view of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page<:
+<p id="intro">Alternate view of Fyrd's <a href="http://caniuse.com/">when can I use...</a> page<:
 my ($canihas, $usage);
 given ($get{usage} // 'wm') {
 	when (!$_) {
@@ -39,7 +39,6 @@ given ($get{usage} // 'wm') {
 :>.
 </p>
 
-<div id="browser">
 <:
 my $caniuse = do 'browser-support.inc.pl' or die $! || $@;
 $_->{verrelease} = {
@@ -56,6 +55,7 @@ my %CSTATS = (
 	'p j' => 'l2',
 	'j'   => 'l2',
 	'p'   => 'l2',
+	'p p' => 'l2',
 	'u'   => 'l0',
 );
 my %CSTATUS = (
@@ -64,7 +64,7 @@ my %CSTATUS = (
 	cr    => 'l4', # candidate
 	pr    => 'l4', # proposed
 	rec   => 'l5', # recommendation
-	other => 'l5', # non-w3
+	other => 'l2', # non-w3
 	ietf  => 'l5', # standard
 );
 my %versions;
@@ -101,12 +101,16 @@ my $header = join('',
 	'<tr>',
 	'<th colspan="3">feature',
 	(map {
-		sprintf('<th colspan="%d" title="%.1f%%">%s',
+		my $name = $caniuse->{agents}->{$_}->{browser};
+		sprintf('<th colspan="%d" title="%s">%s',
 			scalar @{ $versions{$_} },
-			sum(values %{ $canihas->{$_} }),
+			join(' ',
+				sprintf('%.1f%%', sum(values %{ $canihas->{$_} })),
+				$name,
+			),
 			do {
-				my $name = $caniuse->{agents}->{$_}->{browser};
-				length $name < 16 ? $name : $caniuse->{agents}->{$_}->{abbr};
+				length $name < 3 + @{ $versions{$_} }*2 ? $name
+					: $caniuse->{agents}->{$_}->{abbr};
 			},
 		)
 	} @browsers),
@@ -126,18 +130,19 @@ for my $browser (@browsers) {
 	) for @{ $versions{$browser} };
 }
 print '<td>' x 1;
-print "</thead>\n";
+say '</thead>';
+say '<tfoot>', $header, '</tfoot>';
 
 sub featurescore {
 	# relative amount of support for given feature
-	state $statspts = { y=>10, 'y x'=>9, a=>5, 'a x'=>5, j=>2, 'p j'=>2, p=>1 };
+	state $statspts = { y=>10, 'y x'=>10, a=>5, 'a x'=>5, j=>2, 'p j'=>2, 'p p'=>2, p=>1 };
 	my $rank = 0;
 	if (my $row = shift) {
 		if ($canihas) {
 			while (my ($browser, $versions) = each %$row) {
 				ref $versions eq 'HASH' or next;
 				while (my ($version, $_) = each %$versions) {
-					$rank += $canihas->{$browser}->{$version} * $statspts->{$_};
+					$rank += ($canihas->{$browser}->{$version} || .001) * $statspts->{$_};
 				}
 			}
 			return $rank;
@@ -161,75 +166,107 @@ sub featurescore {
 	return $rank;
 }
 
-for my $id (sort {
-	    featurescore($caniuse->{data}->{$b}->{stats})
-	<=> featurescore($caniuse->{data}->{$a}->{stats})
-} keys %{ $caniuse->{data} }) {
+sub saytitlecol {
+	my ($id) = @_;
 	my $row = $caniuse->{data}->{$id};
-	my $data = $row->{stats} or next;  # skip metadata [summary]
-	printf '<tr id="%s">', $id;
+
 	for ($row->{categories}) {
 		my $cell = $_ ? lc $_->[0] : '-';
-		print '<th>', $cell;
+		printf '<th title="%s">%s', join(' + ', @$_), $cell;
 	}
+
 	print '<td>', map {
 		sprintf('<a href="%s" onclick="%s">%s</a>',
 			"#$id",
 			sprintf("try { %s; return false } catch(err) { return true }",
 				"document.getElementById('$id').classList.toggle('target')",
 			),
-			$_,
+			Entity($_),
 		);
 	} $row->{title};
 	print '<div class=aside>';
 	s/\.?$/./, print "<p>$_</p>" for map { ref $_ ? @$_ : $_ || () }
-		$row->{description}, $row->{notes};
-	printf 'Resources: %s.', join(', ',
-		map { qq(<a href="$_->{url}">$_->{title}</a>) } @$_
-	) for grep { @$_ } $row->{links} // ();
+		Entity($row->{description}), formathtml($row->{notes});  # sic
+	printf 'Resources: %s.', join(', ', map {
+		sprintf '<a href="%s">%s</a>', EscapeHTML($_->{url}), $_->{title}
+	} @$_) for grep { @$_ } $row->{links} // ();
 	print '</div>';
+}
+
+sub saystatuscol {
+	my ($id) = @_;
+	my $row = $caniuse->{data}->{$id};
+
 	for ($row->{status}) {
 		my $cell = $_ // '-';
 		$cell = sprintf '<a href="%s">%s</a>', $_, $cell for $row->{spec} // ();
 		printf '<td title="%s" class="l %s">%s',
 			$caniuse->{statuses}->{$_}, $CSTATUS{$_} // '', $cell;
 	}
-	for my $browser (@browsers) {
-		my ($prev, @span);
-		for my $ver (@{ $versions{$browser} }, undef) {
-			unless (!defined $prev
-			or ref $data->{$browser} eq 'HASH'
-			&& $data->{$browser}->{$prev} ~~ $data->{$browser}->{$ver}) {
-				my $usage = sum(map { $canihas->{$browser}->{$_} } @span);
-				printf '<td class="%s" colspan="%d" title="%.1f%%">%s',
-					join(' ',
-						X => $CSTATS{
-							ref $data->{$browser} ne 'HASH' ? 'u' :
-								$data->{$browser}->{$prev} // 'u'
-						},
-						!$usage ? ('p0') : ('p',
-							sprintf('p%01d', $usage / 10),
-							sprintf('p%02d', $usage),
-						),
-						sprintf('pp%02d', $usage / $scorediv),
+}
+
+sub saybrowsercols {
+	my ($id, $browser) = @_;
+	my $data = $caniuse->{data}->{$id}->{stats}->{$browser};
+
+	my ($prev, @span);
+	for my $ver (@{ $versions{$browser} }, undef) {
+		unless (!defined $prev
+		or ref $data eq 'HASH' && $data->{$prev} ~~ $data->{$ver}) {
+			my $usage = sum(map { $canihas->{$browser}->{$_} } @span);
+			printf '<td class="%s" colspan="%d" title="%.1f%%">%s',
+				join(' ',
+					X => $CSTATS{ ref $data eq 'HASH' && $data->{$prev} || 'u' },
+					!$usage ? ('p0') : ('p',
+						sprintf('p%01d', $usage / 10),
+						sprintf('p%02d', $usage),
 					),
-					scalar @span,
-					$usage,
-					showversions(@span),
-				undef $prev;
-				@span = ();
-			}
-			push @span, $ver;
-			$prev = $ver;
+					sprintf('pp%02d', $usage / $scorediv),
+				),
+				scalar @span,
+				$usage,
+				showversions(@span),
+			undef $prev;
+			@span = ();
 		}
+		push @span, $ver;
+		$prev = $ver;
 	}
+}
+
+sub sayusagecol {
+	my ($id) = @_;
 	state $maxscore = featurescore({  # yes for every possible version
 		map { $_ => { map {$_ => 'y'} @{$versions{$_}} } } keys %versions
 	});
 	print '<td>', int featurescore($caniuse->{data}->{$id}->{stats}) / $maxscore * 100;
 }
-print '<tfoot>', $header;
-print '</table>';
+
+say '<tbody>';
+for my $id (sort {
+	    featurescore($caniuse->{data}->{$b}->{stats})
+	<=> featurescore($caniuse->{data}->{$a}->{stats})
+} keys %{ $caniuse->{data} }) {
+	$caniuse->{data}->{$id}->{stats} or next;  # skip metadata [summary]
+	printf '<tr id="%s">', $id;
+	saytitlecol($id);
+	saystatuscol($id);
+	saybrowsercols($id, $_) for @browsers;
+	sayusagecol($id);
+	say '</tr>';
+}
+say '</tbody>';
+say '</table>';
+
+sub formathtml {
+	my $ref = defined wantarray ? [@_] : \@_;
+	for (@$ref) {
+		s/& (?!\w)/&amp;/gx;
+		s/< \s/&lt;/gx;
+		s/\n\K\n/<br>/g;
+	}
+	return @$ref;
+}
 
 sub paddedver {
 	# normalised version number comparable as string (cmp)
@@ -246,8 +283,7 @@ sub showversions {
 	return join('‒', @span);
 }
 
-:></div>
-
+:>
 <hr>
 
 <div class="legend">
@@ -257,7 +293,7 @@ sub showversions {
 	<td class="X l2">external (js/plugin)
 	<td class="X l1">missing
 	<td class="X l0">unknown
-	<td class="X l0 ex">prefixed
+	<td class="X ex">prefixed
 	</table>
 
 	<p><: if ($usage) { :>
@@ -287,3 +323,6 @@ sub showversions {
 	</div>
 </div>
 
+<script type="text/javascript" src="/searchlocal.js"></script>
+<script type="text/javascript"> prependsearch(document.getElementById('intro')) </script>
+