use native trim & json functions

jontey · Aug 27, 2014 · c0475de · c0475de
1 parent df5d289
commit c0475de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/asset/js/common.js b/asset/js/common.js
@@ -27,13 +27,3 @@ function wpsdb_add_commas(number_string) {
   }
   return x1 + x2;
 }
-
-function wpsdb_parse_json(maybe_json) {
-  try {
-    var json_object = jQuery.parseJSON(maybe_json);
-  } catch (e) {
-    // we simply return false here because the json data itself will never just contain a value of "false"
-    return false;
-  }
-  return json_object;
-}
diff --git a/asset/js/script.js b/asset/js/script.js
@@ -1123,10 +1123,10 @@ var execute_next_step;
               },
               success: function(data) {
                 doing_ajax = false;
-                data = $.trim(data);
-                row_information = wpsdb_parse_json(data);
-                if (false == row_information || null ==
-                  row_information) {
+                data = data.trim();
+                try {
+                  row_information = JSON.parse(data);
+                } catch (variable) {
                   $('.progress-title').html('Migration failed');
                   if ('' == data || null == data) {
                     $('.progress-text').html(wpsdb_i10n.table_process_problem_empty_response +