<!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>[5428] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins: Plugin Directory: Use the new library loader for Google Charts.</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/5428">5428</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/5428","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-29 14:34:10 +0000 (Sat, 29 Apr 2017)</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: Use the new library loader for Google Charts.
Prevents a warning in Chrome about the use of `document.write`, see https://www.chromestatus.com/feature/5718547946799104.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsjsstatsjs">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/stats.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsfunctionsphp"></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/themes/pub/wporg-plugins/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php 2017-04-29 14:25:33 UTC (rev 5427)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/functions.php 2017-04-29 14:34:10 UTC (rev 5428)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,8 +76,8 @@
</span><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"> if ( get_query_var( 'plugin_advanced' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_enqueue_script( 'google-jsapi', 'https://www.google.com/jsapi', array(), false, true );
- wp_enqueue_script( 'wporg-plugins-stats', get_template_directory_uri() . '/js/stats.js', array( 'jquery', 'google-jsapi' ), '20170328', true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_enqueue_script( 'google-charts-loader', 'https://www.gstatic.com/charts/loader.js', array(), false, true );
+ wp_enqueue_script( 'wporg-plugins-stats', get_template_directory_uri() . '/js/stats.js', array( 'jquery', 'google-charts-loader' ), '20170328', true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script( 'wporg-plugins-stats', 'pluginStats', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => is_singular( 'plugin' ) ? get_queried_object()->post_name : '',
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsjsstatsjs"></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/themes/pub/wporg-plugins/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/themes/pub/wporg-plugins/js/stats.js 2017-04-29 14:25:33 UTC (rev 5427)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/stats.js 2017-04-29 14:34:10 UTC (rev 5428)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,49 +1,53 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* globals google:object */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-google.load( 'visualization', '1', { packages: ['corechart'] } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+google.charts.load( 'current', {
+ packages: [ 'corechart' ]
+});
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ( function( $, settings ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $( function () {
</span><span class="cx" style="display: block; padding: 0 10px"> $.getJSON('https://api.wordpress.org/stats/plugin/1.0/downloads.php?slug=' + settings.slug + '&limit=267&callback=?', function( downloads ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var data = new google.visualization.DataTable(),
- count = 0,
- sml;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ google.charts.setOnLoadCallback( function() {
+ var data = new google.visualization.DataTable(),
+ count = 0,
+ sml;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- data.addColumn( 'date', settings.l10n.date );
- data.addColumn( 'number', settings.l10n.downloads );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ data.addColumn( 'date', settings.l10n.date );
+ data.addColumn( 'number', settings.l10n.downloads );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.each( downloads, function( key, value ) {
- data.addRow();
- data.setValue( count, 0, new Date( key ) );
- data.setValue( count, 1, Number( value ) );
- count++;
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $.each( downloads, function( key, value ) {
+ data.addRow();
+ data.setValue( count, 0, new Date( key ) );
+ data.setValue( count, 1, Number( value ) );
+ count++;
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sml = data.getNumberOfRows() < 225;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sml = data.getNumberOfRows() < 225;
</ins><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.LineChart( document.getElementById( 'plugin-download-stats' ) ).draw( data, {
- colors: ['#253578'],
- legend: { position: 'none' },
- titlePosition: 'in',
- axisTitlesPosition: 'in',
- chartArea: {
- height: 280,
- left: ( sml ? 50 : 0 ),
- width: ( sml ? 482 : '100%' )
- },
- hAxis: {
- textStyle: { color: 'black', fontSize: 9 },
- format: 'MMM y'
- },
- vAxis: {
- format: '###,###',
- textPosition: ( sml ? 'out' : 'in' ),
- viewWindowMode: 'explicit',
- viewWindow: { min: 0 }
- },
- bar: { groupWidth: ( data.getNumberOfRows() > 100 ? '100%' : null ) },
- height: 350,
- width: 532,
- curveType: 'function'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ new google.visualization.LineChart( document.getElementById( 'plugin-download-stats' ) ).draw( data, {
+ colors: ['#253578'],
+ legend: { position: 'none' },
+ titlePosition: 'in',
+ axisTitlesPosition: 'in',
+ chartArea: {
+ height: 280,
+ left: ( sml ? 50 : 0 ),
+ width: ( sml ? 482 : '100%' )
+ },
+ hAxis: {
+ textStyle: { color: 'black', fontSize: 9 },
+ format: 'MMM y'
+ },
+ vAxis: {
+ format: '###,###',
+ textPosition: ( sml ? 'out' : 'in' ),
+ viewWindowMode: 'explicit',
+ viewWindow: { min: 0 }
+ },
+ bar: { groupWidth: ( data.getNumberOfRows() > 100 ? '100%' : null ) },
+ height: 350,
+ width: 532,
+ curveType: 'function'
+ } );
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,68 +75,70 @@
</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 barHeaders = [ '' ],
- barValues = [ '' ],
- versionList = [],
- index = 0,
- data, formatter;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ google.charts.setOnLoadCallback( function() {
+ var barHeaders = [ '' ],
+ barValues = [ '' ],
+ versionList = [],
+ index = 0,
+ 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">- // Gather and sort the list of versions.
- $.each( versions, function( version ) {
- versionList.push( version );
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Gather and sort the list of versions.
+ $.each( versions, function( version ) {
+ versionList.push( version );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Sort the version list by version.
- versionList.sort( function( a, b ) {
- a = a.split( '.' );
- b = b.split( '.' );
- return ( a[0] !== b[0] ) ? a[0]-b[0] : a[1]-b[1];
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Sort the version list by version.
+ versionList.sort( function( a, b ) {
+ a = a.split( '.' );
+ b = b.split( '.' );
+ return ( a[0] !== b[0] ) ? a[0]-b[0] : a[1]-b[1];
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Move 'other' versions to the beginning.
- if ( 'other' === versionList[ versionList.length - 1 ] ) {
- versionList.unshift( versionList.pop() );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Move 'other' versions to the beginning.
+ if ( 'other' === versionList[ versionList.length - 1 ] ) {
+ 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">- // Add all the versions
- versionList.forEach( function( version ) {
- barHeaders.push( version );
- barValues.push( versions[ version ] );
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add all the versions
+ versionList.forEach( function( version ) {
+ barHeaders.push( version );
+ barValues.push( versions[ version ] );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- data = google.visualization.arrayToDataTable([
- barHeaders,
- barValues
- ]);
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Format it as percentages
- formatter = new google.visualization.NumberFormat( {
- fractionDigits: 1,
- suffix: '%'
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Format it as percentages
+ formatter = new google.visualization.NumberFormat( {
+ fractionDigits: 1,
+ suffix: '%'
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $.each( barValues, function( value ) {
- if ( barValues[ value ] ) {
- formatter.format( data, ++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">- new google.visualization.BarChart( document.getElementById( 'plugin-version-stats' ) ).draw( data, {
- legend: {
- position: 'bottom'
- },
- chartArea: {
- left: '0',
- width: '100%',
- height: '80%',
- top: '10%'
- },
- hAxis: {
- gridlines: {
- color: 'transparent'
- }
- },
- isStacked: true
</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, {
+ legend: {
+ position: 'bottom'
+ },
+ chartArea: {
+ left: '0',
+ width: '100%',
+ height: '80%',
+ top: '10%'
+ },
+ hAxis: {
+ gridlines: {
+ color: 'transparent'
+ }
+ },
+ isStacked: true
+ } );
</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"> } );
</span></span></pre>
</div>
</div>
</body>
</html>