Changeset 6636

Timestamp:

07/25/2017 10:06:17 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Converter: Update bbp_converter_status() to use current step.

When actually converting data, this step is only bumped when moving between major events, not minors.

File:

• trunk/src/includes/admin/assets/js/converter.js (modified) (2 diffs)

trunk/src/includes/admin/assets/js/converter.js

@@ -257 +257 @@
      * @since 2.6.0 bbPress (r6513)
      *
+     * @param {object} data
+     *
      * @returns {void}
      */
     function bbp_converter_status( data ) {
-        var remaining = parseInt( BBP_Converter.delay, 10 ) / 1000,
-            step      = parseInt( data.current_step,   10 ) + 1;
+        var remaining = parseInt( BBP_Converter.delay, 10 ) / 1000;
 
         status.text( BBP_Converter.strings.status_counting.replace( '%s', remaining ) );
@@ -274 +275 @@
 
                 if ( parseInt( data.current_step, 10 ) < parseInt( data.final_step, 10 ) ) {
-                    status.text( BBP_Converter.strings.status_up_next.replace( '%s', step ) );
+                    status.text( BBP_Converter.strings.status_up_next.replace( '%s', data.current_step ) );
                 } else {
                     status.text( BBP_Converter.strings.status_complete );