Merge branch 'master' of https://github.com/toolbox-team/reddit-moder…

…ator-toolbox
toolbox-team · Sep 9, 2021 · 65084bc · 65084bc
2 parents 142da74 + 774c9b5
commit 65084bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/extension/data/modules/config.js b/extension/data/modules/config.js
@@ -367,6 +367,10 @@ function tbconfig () {
             $body.css('overflow', 'auto');
 
             $('.tb-config-color-chooser').remove();
+            config = TBCore.config;
+            sortReasons = [];
+            subreddit = null;
+            postFlairTemplates = null;
         });
 
         // now we can play around!

diff --git a/extension/data/modules/removalreasons.js b/extension/data/modules/removalreasons.js
@@ -192,12 +192,6 @@ function removalreasons () {
                 thingSubreddit,
                 isComment = false; // default to false for new Reddit
 
-            // If the shift key was pressed, remove without a removal reason,
-            // unless this is the explicit "Add removal reason" button.
-            if (event.shiftKey && !$button.hasClass('tb-add-removal-reason')) {
-                return;
-            }
-
             // For now, removals on Toolbox-generated posts/comments work the same way as on old Reddit (without jsAPI)
             if (TBCore.isOldReddit || $button.is('.tb-submission-button-remove, .tb-comment-button-remove')) {
                 const $yes = $button.find('.yes')[0],
@@ -223,6 +217,12 @@ function removalreasons () {
                 }
             }
 
+            // If the shift key was pressed, remove without a removal reason,
+            // unless this is the explicit "Add removal reason" button.
+            if (event.shiftKey && !$button.hasClass('tb-add-removal-reason')) {
+                return;
+            }
+
             const info = await TBCore.getApiThingInfo(thingID, thingSubreddit, false);
             // Get link/comment attributes
             const data = {