Progress/Stop. Use textContent. Unlock for empty lists. Remove unused…

… args
vaeth · Nov 12, 2017 · 482dd53 · 482dd53
1 parent f73da65
commit 482dd53
Show file tree

Hide file tree

Showing 6 changed files with 203 additions and 47 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,14 @@
 # ChangeLog for squashmount
 
+*bookmarkdupes-1.0
+	Martin Väth <martin at mvath.de>:
+	- Show progress when removing/stripping
+	- Add emergency stop button
+	- More specific messages
+	- Use textContent instead of redundant child text nodes
+	- Bugfix: Removing/stripping empty lists might have locked buttons
+	- Code cleanup: remove unused arguments
+
 *bookmarkdupes-0.5
 	Martin Väth <martin at mvath.de>:
 	- Avoid unsafe assignment to innerHTML

diff --git a/_locales/de/messages.json b/_locales/de/messages.json
@@ -47,6 +47,14 @@
     "message": "Beschreibungen markierter Lesezeichen entfernen",
     "description": "Button for stripping descriptions of marked bookmarks"
   },
+  "buttonStopRemoving": {
+    "message": "Löschen abbrechen!",
+    "description": "Button for emergency stop of bookmark removing"
+  },
+  "buttonStopStripping": {
+    "message": "Entfernen abbrechen!",
+    "description": "Button for emergency stop of description stripping"
+  },
   "messageExactMatchesGroups": {
     "message": "Exakte Duplikate ($TOTAL$ Lesezeichen in $GROUPS$ Gruppen)",
     "description": "Report specified numbers of exact matches and groups",
@@ -109,6 +117,28 @@
       }
     }
   },
+  "messageRemoveMarked": {
+    "message": "Markierte Lesezeichen werden gelöscht.",
+    "description": "Report that removal of marked bookmarks started"
+  },
+  "messageRemoveProgress": {
+    "message": "($PERCENTAGE$ %) $TOTAL$ of $TODO$ Lesezeichen entfernt",
+    "description": "Report that specified number/total/percentage of bookmarks are removed",
+    "placeholders": {
+      "total": {
+        "content": "$1",
+        "example": "0"
+      },
+      "todo": {
+        "content": "$2",
+        "example": "1"
+      },
+      "percentage": {
+        "content": "$3",
+        "example": "0"
+      }
+    }
+  },
   "messageRemoveSuccess": {
     "message": "$TOTAL$ Lesezeichen gelöscht!",
     "description": "Report success when removing specified number of bookmarks",
@@ -133,6 +163,28 @@
       }
     }
   },
+  "messageStripMarked": {
+    "message": "Beschreibungen markierter Lesezeichen werden entfernt.",
+    "description": "Report that description stripping started"
+  },
+  "messageStripProgress": {
+    "message": "($PERCENTAGE$ %) $TOTAL$ von $TODO$ Beschreibungen entfernt",
+    "description": "Report that specified number/total/percentage of descriptions are stripped",
+    "placeholders": {
+      "total": {
+        "content": "$1",
+        "example": "0"
+      },
+      "todo": {
+        "content": "$2",
+        "example": "1"
+      },
+      "percentage": {
+        "content": "$3",
+        "example": "0"
+      }
+    }
+  },
   "messageStripSuccess": {
     "message": "$TOTAL$ Beschreibungen entfernt!",
     "description": "Report success when stripping specified number of descriptions",
@@ -157,10 +209,6 @@
       }
     }
   },
-  "messageRemovingMarked": {
-    "message": "Lösche",
-    "description": "Report that removal of marked items started"
-  },
   "errorNodeNotFound": {
     "message": "Eintrag nicht gefunden",
     "description": "Report error that node could not be found"

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -47,6 +47,14 @@
     "message": "Strip descriptions of marked bookmarks",
     "description": "Button for stripping descriptions of marked bookmarks"
   },
+  "buttonStopRemoving": {
+    "message": "Stop removing!",
+    "description": "Button for emergency stop of bookmark removing"
+  },
+  "buttonStopStripping": {
+    "message": "Stop stripping!",
+    "description": "Button for emergency stop of description stripping"
+  },
   "messageExactMatchesGroups": {
     "message": "Exact dupes ($TOTAL$ matches in $GROUPS$ groups)",
     "description": "Report specified numbers of exact matches and groups",
@@ -109,6 +117,28 @@
       }
     }
   },
+  "messageRemoveMarked": {
+    "message": "Removing marked bookmarks",
+    "description": "Report that removal of marked bookmarks started"
+  },
+  "messageRemoveProgress": {
+    "message": "($PERCENTAGE$ %) $TOTAL$ of $TODO$ bookmarks removed",
+    "description": "Report that specified number/total/percentage of bookmarks are removed",
+    "placeholders": {
+      "total": {
+        "content": "$1",
+        "example": "0"
+      },
+      "todo": {
+        "content": "$2",
+        "example": "1"
+      },
+      "percentage": {
+        "content": "$3",
+        "example": "0"
+      }
+    }
+  },
   "messageRemoveSuccess": {
     "message": "$TOTAL$ bookmarks removed!",
     "description": "Report success when removing specified number of bookmarks",
@@ -133,6 +163,28 @@
       }
     }
   },
+  "messageStripMarked": {
+    "message": "Stripping descriptions of marked bookmarks",
+    "description": "Report that description stripping started"
+  },
+  "messageStripProgress": {
+    "message": "($PERCENTAGE$ %) $TOTAL$ of $TODO$ descriptions stripped",
+    "description": "Report that specified number/total/percentage of descriptions are stripped",
+    "placeholders": {
+      "total": {
+        "content": "$1",
+        "example": "0"
+      },
+      "todo": {
+        "content": "$2",
+        "example": "1"
+      },
+      "percentage": {
+        "content": "$3",
+        "example": "0"
+      }
+    }
+  },
   "messageStripSuccess": {
     "message": "$TOTAL$ descriptions stripped!",
     "description": "Report success when stripping specified number of descriptions",
@@ -157,10 +209,6 @@
       }
     }
   },
-  "messageRemovingMarked": {
-    "message": "Removing",
-    "description": "Report that removal of marked items started"
-  },
   "errorNodeNotFound": {
     "message": "node not found",
     "description": "Report error that node could not be found"