Changeset 3384

Timestamp:

06/16/2016 11:03:59 AM (8 years ago)

Author:

obenland

Message:

Plugin Directory: Update version stats to handle the new data source.

See #1596.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/js/stats.js (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/js/stats.js

@@ -53 +53 @@
             }
 
-            var bar_headers = [],
-                bar_values = [],
-                version_list = [],
-                to_combine = [],
-                older_versions = 0,
-                combine_limit = 6,
-                combine_percentage = 1,
-                version,
-                index,
-                bar_table_versions,
-                formatter;
-
-            // Start of the Google Datatable requirements.
-            bar_headers.push( '' );
-            bar_values.push( '' );
+            var barHeaders  = [ '' ],
+                barValues   = [ '' ],
+                versionList = [],
+                index       = 0,
+                version, data, formatter;
 
             // Gather and sort the list of versions.
-            for ( version in versions ) {
-                version_list.push( version );
-            }
+            $.each( versions, function( version ) {
+                versionList.push( version );
+            } );
 
             // Sort the version list by version.
-            version_list.sort( function( a, b ) {
+            versionList.sort( function( a, b ) {
                 a = a.split( '.' );
                 b = b.split( '.' );
@@ -81 +71 @@
             } );
 
-            // 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 );
-                }
-            }
-
-            // 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 );
-            }
+            // Move 'other' versions to the beginning.
+            versionList.unshift( versionList.pop() );
 
             // Add all the versions
-            version_list.forEach( function( version ) {
-                bar_headers.push( version );
-                bar_values.push( versions[ version ] );
+            versionList.forEach( function( version ) {
+                barHeaders.push( version );
+                barValues.push( versions[ version ] );
             } );
 
-            bar_headers.push( { role: 'annotation' } );
-            bar_values.push( '' );
-
-            bar_table_versions = google.visualization.arrayToDataTable([
-                bar_headers,
-                bar_values
+            data = google.visualization.arrayToDataTable([
+                barHeaders,
+                barValues
             ]);
 
             // Format it as percentages
-            formatter = new google.visualization.NumberFormat({
+            formatter = new google.visualization.NumberFormat( {
                 fractionDigits: 1,
                 suffix: '%'
-            });
-
-            index = 0;
-            bar_values.forEach( function( value ) {
-                if ( bar_values[ value ] ) {
-                    formatter.format( bar_table_versions, index );
-                }
-                index++;
             } );
 
-            new google.visualization.BarChart( document.getElementById( 'plugin-version-stats' ) ).draw( bar_table_versions, {
+            $.each( barValues, function( value ) {
+                if ( barValues[ value ] ) {
+                    formatter.format( data, ++index );
+                }
+            } );
+
+            new google.visualization.BarChart( document.getElementById( 'plugin-version-stats' ) ).draw( data, {
                 legend: {
                     position: 'bottom'