Changeset 43061 for trunk/src/wp-admin/js/xfn.js

Timestamp:

05/01/2018 07:26:53 PM (6 years ago)

Author:

azaozz

Message:

Privacy: improve wp_privacy_erase_personal_data(), return boolean values.

Props ericdaams.
See #43602.

File:

• trunk/src/wp-admin/js/xfn.js (modified) (4 diffs)

trunk/src/wp-admin/js/xfn.js

@@ -142 +142 @@
         var erasersCount  = $action.data( 'erasers-count' );
 
-        var removedCount  = 0;
-        var retainedCount = 0;
+        var hasRemoved    = false;
+        var hasRetained   = false;
         var messages      = [];
 
@@ -153 +153 @@
             var summaryMessage = strings.noDataFound;
             var classes = 'notice-success';
-            if ( 0 === removedCount ) {
-                if ( 0 === retainedCount ) {
+            if ( false === hasRemoved ) {
+                if ( false === hasRetained ) {
                     summaryMessage = strings.noDataFound;
                 } else {
@@ -161 +161 @@
                 }
             } else {
-                if ( 0 === retainedCount ) {
+                if ( false === hasRetained ) {
                     summaryMessage = strings.foundAndRemoved;
                 } else {
@@ -193 +193 @@
                 }
                 var responseData = response.data;
-                if ( responseData.num_items_removed ) {
-                    removedCount += responseData.num_items_removed;
-                }
-                if ( responseData.num_items_retained ) {
-                    retainedCount += responseData.num_items_removed;
+                if ( responseData.items_removed ) {
+                    hasRemoved = hasRemoved || responseData.items_removed;
+                }
+                if ( responseData.items_retained ) {
+                    hasRetained = hasRetained || responseData.items_retained;
                 }
                 if ( responseData.messages ) {