updates from 1.1.4b

Author: notslang

README.md

@@ -1,4 +1,4 @@
 # WP Sync DB Media Files
-An addon for [WP Sync DB](https://github.com/slang800/wp-sync-db) that lets you sync media libraries between WordPress installations.
+An addon for [WP Sync DB](https://github.com/wp-sync-db/wp-sync-db) that lets you sync media libraries between WordPress installations.
 
 <p align="center"><a><img src="https://raw.github.com/slang800/psychic-ninja/master/wp-sync-db-media-files.png"/></a></p>

asset/js/script.js

@@ -3,6 +3,7 @@ var determine_media_to_migrate;
 var remote_media_files_unavailable = false;
 var remote_connection_data;
 var connection_info;
+var media_successfully_determined;
 
 (function($) {
 
@@ -18,17 +19,16 @@ var connection_info;
 
   $(document).ready(function() {
 
-    $.wpsdb.add_action('ready', function() {
-      if (migration_type() == 'savefile') {
-        $('.media-files-options').hide();
-      }
-    });
+    if (migration_type() == 'savefile') {
+      $('.media-files-options').hide();
+    }
 
     var disable_media_files_option = function() {
       $('#media-files').attr('data-available', '0');
       $('#media-files').prop('checked', false);
       $('#media-files').attr('disabled', 'disabled');
       $('.media-files').addClass('disabled');
+      $('.media-files-options .expandable-content').hide();
     };
 
     var hide_show_options = function(unavailable) {
@@ -94,9 +94,9 @@ var connection_info;
     });
 
     determine_media_to_migrate = function() {
-      connection_info = $.trim($('.pull-push-connection-info').val()).split("\n");
-      $('.progress-text').html(
-        'Determining which media files to migrate, please wait...');
+      connection_info = $.trim($('.pull-push-connection-info').val()).split(
+        "\n");
+      $('.progress-text').html(wpsdbmf_strings.determining);
 
       var remove_local_media = 0;
 
@@ -116,13 +116,12 @@ var connection_info;
           url: connection_info[0],
           key: connection_info[1],
           temp_prefix: connection_data.temp_prefix,
-					nonce: wpsdb_nonces.determine_media_to_migrate,
+          nonce: wpsdb_nonces.determine_media_to_migrate,
         },
         error: function(jqXHR, textStatus, errorThrown) {
-          $('.progress-title').html('Migration failed');
-          $('.progress-text').html(
-            'Error while attempting to determine which media files to migrate. (#101mf)'
-          );
+          $('.progress-title').html(wpsdbmf_strings.migration_failed);
+          $('.progress-text').html(wpsdbmf_strings.error_determining +
+            ' (#101mf)');
           $('.progress-text').addClass('migration-error');
           console.log(jqXHR);
           console.log(textStatus);
@@ -139,23 +138,32 @@ var connection_info;
             return;
           }
 
-          media_successfully_determined(data);
+          next_step_in_migration = {
+            fn: media_successfully_determined,
+            args: [data]
+          };
+          execute_next_step();
         }
+
       });
+
     }
 
     function migration_failed(data) {
-      $('.progress-title').html('Migration failed');
+      $('.progress-title').html(wpsdbmf_strings.migration_failed);
       $('.progress-text').html(data);
       $('.progress-text').addClass('migration-error');
       migration_error = true;
       migration_complete_events();
     }
 
-    function media_successfully_determined(data) {
+    media_successfully_determined = function(data) {
       if (typeof data.wpsdb_error != 'undefined' && data.wpsdb_error == 1) {
         non_fatal_errors += data.body;
-        wpsdb_call_next_hook();
+        next_step_in_migration = {
+          fn: wpsdb_call_next_hook
+        };
+        execute_next_step();
         return;
       }
 
@@ -175,12 +183,18 @@ var connection_info;
       $('.progress-tables').empty();
       $('.progress-tables-hover-boxes').empty();
 
-      $('.progress-tables').prepend(
-        '<div title="Media Files" style="width: 100%;" class="progress-chunk media_files"><span>Media Files (<span class="media-migration-current-image">0</span> / ' +
+      $('.progress-tables').prepend('<div title="' + wpsdbmf_strings.media_files +
+        '" style="width: 100%;" class="progress-chunk media_files"><span>' +
+        wpsdbmf_strings.media_files +
+        ' (<span class="media-migration-current-image">0</span> / ' +
         wpsdb_add_commas(Object.size(args.files_to_migrate)) +
         ')</span></div>');
 
-      migrate_media_files_recursive(args);
+      next_step_in_migration = {
+        fn: migrate_media_files_recursive,
+        args: [args]
+      };
+      execute_next_step();
     }
 
     function migrate_media_files_recursive(args) {
@@ -215,7 +229,8 @@ var connection_info;
         }
       });
 
-      var connection_info = $.trim($('.pull-push-connection-info').val()).split("\n");
+      var connection_info = $.trim($('.pull-push-connection-info').val()).split(
+        "\n");
 
       $.ajax({
         url: ajaxurl,
@@ -229,13 +244,12 @@ var connection_info;
           intent: migration_type(),
           url: connection_info[0],
           key: connection_info[1],
-					nonce: wpsdb_nonces.migrate_media,
+          nonce: wpsdb_nonces.migrate_media,
         },
         error: function(jqXHR, textStatus, errorThrown) {
           $('.progress-title').html('Migration failed');
-          $('.progress-text').html(
-            'A problem occurred when migrating the media files. (#102mf)'
-          );
+          $('.progress-text').html(wpsdbmf_strings.problem_migrating_media +
+            ' (#102mf)');
           $('.progress-text').addClass('migration-error');
           console.log(jqXHR);
           console.log(textStatus);
@@ -252,7 +266,8 @@ var connection_info;
             return;
           }
 
-          if (typeof data.wpsdb_error != 'undefined' && data.wpsdb_error == 1) {
+          if (typeof data.wpsdb_error != 'undefined' && data.wpsdb_error ==
+            1) {
             non_fatal_errors += data.body;
           }
 
@@ -262,10 +277,15 @@ var connection_info;
           $('.progress-bar').width(percent + '%');
           overall_percent = Math.floor(percent);
 
-          $('.progress-text').html(overall_percent + '% - Migrating media files');
+          $('.progress-text').html(overall_percent + '% - ' +
+            wpsdbmf_strings.migrating_media_files);
           $('.media-migration-current-image').html(wpsdb_add_commas(args.media_progress_image_number));
 
-          migrate_media_files_recursive(args);
+          next_step_in_migration = {
+            fn: migrate_media_files_recursive,
+            args: [args]
+          };
+          execute_next_step();
         }
       });
     }