Merge pull request #131 from makyen/Mak-update-deleted-check-for-MS-response

FIRE 1.0.31

Author: makyen

fire/README.md

@@ -72,6 +72,7 @@ To open the reported post on it's site:
 
 |1.0    ||
 | ---   |---
+|1.0.31 |Remove display of weight. Adjust probably deleted detection when flagging via MS. Keypress block (again).
 |1.0.30 |Prevent keypress from affecting chat input when the popup is open. Add chat rooms.
 |1.0.29 |Update MS API filters due to MS changes.
 |1.0.28 |Adapt to new SmokeDetector report URL format.

fire/fire.meta.js

@@ -4,7 +4,7 @@
 // @description FIRE adds a button to SmokeDetector reports that allows you to provide feedback & flag, all from chat.
 // @author      Cerbrus
 // @attribution Michiel Dommerholt (https://github.com/Cerbrus)
-// @version     1.0.30
+// @version     1.0.31
 // @icon        https://raw.githubusercontent.com/Ranks/emojione-assets/master/png/32/1f525.png
 // @updateURL   https://raw.githubusercontent.com/Charcoal-SE/Userscripts/master/fire/fire.meta.js
 // @downloadURL https://raw.githubusercontent.com/Charcoal-SE/Userscripts/master/fire/fire.user.js

fire/fire.user.js

@@ -4,7 +4,7 @@
 // @description FIRE adds a button to SmokeDetector reports that allows you to provide feedback & flag, all from chat.
 // @author      Cerbrus
 // @attribution Michiel Dommerholt (https://github.com/Cerbrus)
-// @version     1.0.30
+// @version     1.0.31
 // @icon        https://raw.githubusercontent.com/Ranks/emojione-assets/master/png/32/1f525.png
 // @updateURL   https://raw.githubusercontent.com/Charcoal-SE/Userscripts/master/fire/fire.meta.js
 // @downloadURL https://raw.githubusercontent.com/Charcoal-SE/Userscripts/master/fire/fire.user.js
@@ -904,6 +904,19 @@
       callback();
   }
 
+  /**
+   * stopPropagationIfTargetBody - If the target of the event is the body, then stop propagation.
+   *
+   * @private
+   * @memberof module:fire
+   *
+   * @param {object} event     An event
+   */
+  function stopPropagationIfTargetBody(event) {
+    if (event.target === document.body)
+      event.stopPropagation();
+  }
+
   /**
    * keyboardShortcuts - Handle keypress events for the popup.
    *
@@ -1242,6 +1255,7 @@
         '.fire-popup-body pre',
         ({currentTarget}) => $(currentTarget).toggleClass('fire-expanded')
       );
+    document.addEventListener('keypress', stopPropagationIfTargetBody, true);
   }
 
   /**
@@ -1404,6 +1418,7 @@
       $(document)
         .off('keydown', keyboardShortcuts)
         .off('click', '.fire-popup-body pre');
+      document.removeEventListener('keypress', stopPropagationIfTargetBody, true);
 
       $('#container').removeClass('fire-blur');
 
@@ -1566,7 +1581,7 @@
               response = {message: jqXHR.responseText};
             }
 
-            if (response.message === 'Spam flag option not present') {
+            if (response.message === 'Flag option not present') {
               toastr.info('This post could not be flagged.<br />' +
                 'It is probably deleted already.');
               closePopup();