Merge branch 'develop' into webpackResolver

package.json

@@ -107,13 +107,13 @@
     "redux-throttle": "0.1.1",
     "rimraf": "^2.6.1",
     "scratch-audio": "0.1.0-prerelease.20190114210212",
-    "scratch-l10n": "3.5.20190731161310",
+    "scratch-l10n": "3.5.20190807144510",
     "scratch-blocks": "0.1.0-prerelease.1564769819",
-    "scratch-paint": "0.2.0-prerelease.20190729153946",
+    "scratch-paint": "0.2.0-prerelease.20190807143414",
     "scratch-render": "0.1.0-prerelease.20190605151415",
     "scratch-storage": "1.3.2",
     "scratch-svg-renderer": "0.2.0-prerelease.20190715153806",
-    "scratch-vm": "0.2.0-prerelease.20190731151656",
+    "scratch-vm": "0.2.0-prerelease.20190805150531",
     "selenium-webdriver": "3.6.0",
     "startaudiocontext": "1.2.1",
     "style-loader": "^0.23.0",

src/lib/drag-recognizer.js

@@ -109,8 +109,10 @@ class DragRecognizer {
     }
 
     _handleEnd () {
-        this._onDragEnd();
         this.reset();
+        // Call the callback after reset to make sure if gestureInProgress()
+        // is used in response, it get the correct value (i.e. no gesture in progress)
+        this._onDragEnd();
     }
 
     _isDrag () {

test/unit/util/drag-recognizer.test.js

@@ -56,6 +56,17 @@ describe('DragRecognizer', () => {
         expect(onDrag).toHaveBeenCalledTimes(1); // Still 1
     });
 
+    test('start -> end calls dragEnd callback after resetting internal state', done => {
+        onDragEnd = () => {
+            expect(dragRecognizer.gestureInProgress()).toBe(false);
+            done();
+        };
+        dragRecognizer = new DragRecognizer({onDrag, onDragEnd});
+        dragRecognizer.start({clientX: 100, clientY: 100});
+        window.dispatchEvent(new MouseEvent('touchmove', {clientX: 150, clientY: 106}));
+        window.dispatchEvent(new MouseEvent('touchend', {clientX: 150, clientY: 106}));
+    });
+
     test('start -> reset unbinds', () => {
         dragRecognizer.start({clientX: 100, clientY: 100});
         window.dispatchEvent(new MouseEvent('touchmove', {clientX: 150, clientY: 106}));