<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[3384] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/js/stats.js: Plugin Directory: Update version stats to handle the new data source.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/3384">3384</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3384","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-16 11:03:59 +0000 (Thu, 16 Jun 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Plugin Directory: Update version stats to handle the new data source.
See <a href="http://meta.trac.wordpress.org/ticket/1596">#1596</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjsstatsjs">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/js/stats.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryjsstatsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/js/stats.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/js/stats.js 2016-06-16 08:15:28 UTC (rev 3383)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/js/stats.js 2016-06-16 11:03:59 UTC (rev 3384)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,100 +52,51 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var bar_headers = [],
- bar_values = [],
- version_list = [],
- to_combine = [],
- older_versions = 0,
- combine_limit = 6,
- combine_percentage = 1,
- version,
- index,
- bar_table_versions,
- formatter;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var barHeaders = [ '' ],
+ barValues = [ '' ],
+ versionList = [],
+ index = 0,
+ version, data, formatter;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Start of the Google Datatable requirements.
- bar_headers.push( '' );
- bar_values.push( '' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Gather and sort the list of versions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- for ( version in versions ) {
- version_list.push( version );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( versions, function( version ) {
+ versionList.push( version );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sort the version list by version.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version_list.sort( function( a, b ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ versionList.sort( function( a, b ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> a = a.split( '.' );
</span><span class="cx" style="display: block; padding: 0 10px"> b = b.split( '.' );
</span><span class="cx" style="display: block; padding: 0 10px"> return ( a[0] != b[0] ) ? a[0]-b[0] : a[1]-b[1];
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Move any versions (old or new) with < combine_percentage into the combined list.
- for ( index in version_list ) {
- version = version_list[ index ];
- if ( versions[ version ] <= combine_percentage ) {
- to_combine.push( version );
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move 'other' versions to the beginning.
+ versionList.unshift( versionList.pop() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If a plugin has more than 6 versions, combine the older ones into a "Older Versions" group.
- if ( version_list.length > combine_limit ) {
- for ( index in version_list ) {
- version = version_list[ index ];
- if ( ( version_list.length - to_combine.length ) <= combine_limit ) {
- break;
- }
- if ( to_combine.indexOf( version ) > -1 ) {
- continue; // Next.
- }
- to_combine.push( version );
- }
- }
-
- // Only combine when there's multiples in there
- if ( to_combine.length > 1 ) {
- to_combine.forEach( function( version ) {
- older_versions += versions[ version ];
-
- delete versions[ version ];
- delete version_list[ version_list.indexOf( version ) ];
- } );
- }
-
- if ( older_versions ) {
- bar_headers.push( settings.l10n.otherVersions );
- bar_values.push( Math.round( older_versions * 100 ) / 100 );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Add all the versions
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- version_list.forEach( function( version ) {
- bar_headers.push( version );
- bar_values.push( versions[ version ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ versionList.forEach( function( version ) {
+ barHeaders.push( version );
+ barValues.push( versions[ version ] );
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bar_headers.push( { role: 'annotation' } );
- bar_values.push( '' );
-
- bar_table_versions = google.visualization.arrayToDataTable([
- bar_headers,
- bar_values
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ data = google.visualization.arrayToDataTable([
+ barHeaders,
+ barValues
</ins><span class="cx" style="display: block; padding: 0 10px"> ]);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Format it as percentages
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- formatter = new google.visualization.NumberFormat({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ formatter = new google.visualization.NumberFormat( {
</ins><span class="cx" style="display: block; padding: 0 10px"> fractionDigits: 1,
</span><span class="cx" style="display: block; padding: 0 10px"> suffix: '%'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- index = 0;
- bar_values.forEach( function( value ) {
- if ( bar_values[ value ] ) {
- formatter.format( bar_table_versions, index );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( barValues, function( value ) {
+ if ( barValues[ value ] ) {
+ formatter.format( data, ++index );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- index++;
</del><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- new google.visualization.BarChart( document.getElementById( 'plugin-version-stats' ) ).draw( bar_table_versions, {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ new google.visualization.BarChart( document.getElementById( 'plugin-version-stats' ) ).draw( data, {
</ins><span class="cx" style="display: block; padding: 0 10px"> legend: {
</span><span class="cx" style="display: block; padding: 0 10px"> position: 'bottom'
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span></span></pre>
</div>
</div>
</body>
</html>