X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/862a7763364af7fb80ee3515a88a7f157438dbe0..dd0fba64e720055cf4733f422efef687a16d49fa:/browser.plp

diff --git a/browser.plp b/browser.plp
index fa317a8..beff4a9 100644
--- a/browser.plp
+++ b/browser.plp
@@ -29,6 +29,10 @@ $_->{verrelease} = {
 
 my %CSTATS = (
 	'n'   => 'l1',
+	'n d' => 'l2',
+	'n x d' => 'l2 ex',
+	'p d' => 'l2',
+	'a d' => 'l2',
 	'y'   => 'l5',
 	'y x' => 'l5 ex',
 	'a'   => 'l3',
@@ -46,6 +50,7 @@ my %DSTATS = (
 	j => 'javascript required',
 	a => 'partial',
 	y => 'supported',
+	d => 'disabled by default',
 	x => sub {
 		join(' ',
 			'requires prefix',
@@ -73,7 +78,7 @@ my @browsers = keys %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 ($canihas, $usage, $minusage);
 given ($get{usage} // 'wm') {
 	when (!$_) {
 		# none
@@ -96,7 +101,8 @@ given ($get{usage} // 'wm') {
 if ($usage) { # first() does not work inside given >:(
 	# adapt version usage to actual support data
 	my %engineuse;  # prefix => usage sum
-	while (my ($browser, $row) = each %$canihas) {
+	for my $browser (keys %versions) {
+		my $row = $canihas->{$browser} // {};
 		my $verlist = $versions{$browser} or next;
 		my %supported = map { $_ => 1 } @$verlist;
 
@@ -110,6 +116,24 @@ if ($usage) { # first() does not work inside given >:(
 			$row->{$version} = 0;  # balance browser total
 		}
 
+		# build row list for each version
+		if ($minusage = $get{threshold} // .5) {
+			my @vershown;  # $verlist replacement
+			my ($rowusage, @verrow) = (0);  # replacement row tracking
+			for (@$verlist) {
+				push @verrow, $_;  # queue each version
+				if (($rowusage += $row->{$_}) >= $minusage) {
+					push @vershown, [@verrow];   # add row
+					($rowusage, @verrow) = (0);  # reset row tracking
+				}
+			}
+			push @vershown, \@verrow if @verrow;  # always add latest
+			@$verlist = @vershown;
+		}
+		else {
+			@$verlist = map { [$_] } @$verlist;
+		}
+
 		# reusable aggregates (grouped by prefix (engine) and browser)
 		$engineuse{ $caniuse->{agents}->{$browser}->{prefix} } +=
 		$row->{-total} = sum(values %$row);
@@ -154,8 +178,8 @@ my $usagemax = (max(map { ref $_ eq 'HASH' && sum(values %$_) } values %$canihas
 
 my $usagepct = 1;  # score multiplier for 0..100 result
 # normalise usage percentage to only include shown browsers
-$usagepct = 100 / featurescore({  # yes for every possible version
-	map { $_ => { map {$_ => 'y'} @{$versions{$_}} } } keys %versions
+$usagepct = 100.01 / featurescore({  # yes for every possible version
+	map { $_ => { map {$_ => 'y'} map { @{$_} } @{$versions{$_}} } } keys %versions
 });
 
 print '<table class="mapped">';
@@ -190,17 +214,18 @@ print '<thead>', $header;
 print "\n<tr>";
 print '<td>' x 3;
 for my $browser (@browsers) {
-	for my $_ (@{ $versions{$browser} }) {
-		my $release = $caniuse->{agents}->{$browser}->{verrelease}->{$_};
+	for (@{ $versions{$browser} }) {
+		my $lastver = $_->[-1];
+		my $release = $caniuse->{agents}->{$browser}->{verrelease}->{$lastver};
 		my $future = defined $release;
 		printf('<td title="%s"%s>%s',
 			join(' ',
-				sprintf('%.1f%%', $canihas->{$browser}->{$_} * $usagepct),
+				sprintf('%.1f%%', sum(@{ $canihas->{$browser} }{@$_}) * $usagepct),
 				$future ? 'development' : (),
-				"version $_",
+				'version ' . join(', ', @{$_}),
 			),
 			$future && ' class="ex"',
-			showversions($_),
+			showversions($lastver),
 		);
 	}
 }
@@ -287,7 +312,8 @@ sub saystatuscol {
 
 sub saybrowsercols {
 	my ($id, $browser) = @_;
-	my $data = $caniuse->{data}->{$id}->{stats}->{$browser};
+	my $feature = $caniuse->{data}->{$id};
+	my $data = $feature->{stats}->{$browser};
 	if (ref $data eq 'ARRAY') {
 		# special case for unsupported
 		my $release = $caniuse->{agents}->{$browser}->{verrelease};
@@ -301,14 +327,29 @@ sub saybrowsercols {
 		my $compare = (
 			!defined $ver ? undef :      # last column if nameless
 			ref $data ne 'HASH' ? '' :   # unclassified if no support hash
-			$data->{$ver} // $prev       # known or inherit from predecessor
-			// (grep { defined } @{$data}{ @{ $versions{$browser} } })[0]
+			$data->{ $ver->[-1] } // $prev  # known or inherit from predecessor
+			// (grep { defined } @{$data}{ map { $_->[0] } @{ $versions{$browser} } })[0]
 			   ~~ 'n' && 'n'             # first known version is unsupported
 			|| 'u'                       # unsure
 		);
 		unless (!defined $prev or $prev ~~ $compare) {
-			my $usage = sum(map { $canihas->{$browser}->{$_} } @span);
-			printf '<td class="%s" colspan="%d" title="%s">%s',
+			my $usage = sum(@{ $canihas->{$browser} }{ map { @{$_} } @span });
+
+			# strip #\d note references from support class
+			my @notes;
+			push @notes, $feature->{notes_by_num}->{$1}
+				while $prev =~ s/\h \# (\d+) \b//x;
+
+			# prepare version hover details
+			my $title = sprintf('%.1f%% %s', $usage * $usagepct, join(', ',
+				map { ref $_ eq 'CODE' ? $_->($browser) : $_ }
+				map { $DSTATS{$_} // () }
+				map { split / /, $_ }
+				$prev
+			));
+			$title .= "\n".EscapeHTML($_) for @notes;
+
+			printf('<td class="%s" colspan="%d" title="%s">%s',
 				join(' ',
 					X => $CSTATS{$prev},
 					!$usage ? ('p0') : ('p',
@@ -318,17 +359,13 @@ sub saybrowsercols {
 					sprintf('pp%02d', $usage / $usagemax),
 				),
 				scalar @span,
-				sprintf('%.1f%% %s', $usage * $usagepct, join(', ',
-					map { ref $_ eq 'CODE' ? $_->($browser) : $_ }
-					map { $DSTATS{$_} // () }
-					map { split / /, $_ }
-					$prev
-				)),
-				showversions(@span),
+				$title,
+				showversions($span[0]->[0], @span > 1 ? ($span[-1]->[-1]) : ()),
+			);
 			undef $prev;
 			@span = ();
 		}
-		push @span, $ver;
+		push @span, $ver && [ grep { $data->{ $_ } eq $data->{ $ver->[-1] } } @{$ver} ];
 		$prev = $compare;
 	}
 }
@@ -379,7 +416,7 @@ sub showversions {
 	<table class="glyphs"><tr>
 	<td class="X l5">supported
 	<td class="X l3">partial
-	<td class="X l2">external (js/plugin)
+	<td class="X l2">optional
 	<td class="X l1">missing
 	<td class="X l0">unknown
 	<td class="X ex">prefixed
@@ -408,6 +445,8 @@ sub showversions {
 			<:= defined $get{style} && 'set to ' :><em><:= $style :></em>
 		<li><strong>usage</strong> source is
 			<:= !defined $get{usage} && 'default ' :><:= defined $usage ? "<em>$usage</em>" : 'not included (<em>0</em>)' :>
+		<li>usage <strong>threshold</strong> is
+			<:= defined $get{threshold} && 'changed to ' :><em><:= $minusage :>%</em>
 		</ul>
 	</div>
 </div>