From 26e4bc2ad26d86aff08bc74c06272febf138090c Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Wed, 26 Jun 2019 10:56:54 -0400
Subject: [PATCH] Fix merge conflicts
---
src/containers/sprite-selector-item.jsx | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/containers/sprite-selector-item.jsx b/src/containers/sprite-selector-item.jsx
index b800eafe4..f946cf83f 100644
--- a/src/containers/sprite-selector-item.jsx
+++ b/src/containers/sprite-selector-item.jsx
@@ -9,6 +9,7 @@ import storage from '../lib/storage';
import VM from 'scratch-vm';
import getCostumeUrl from '../lib/get-costume-url';
import DragRecognizer from '../lib/drag-recognizer';
+import {getEventXY} from '../lib/touch-utils';
import SpriteSelectorItemComponent from '../components/sprite-selector-item/sprite-selector-item.jsx';
@@ -35,14 +36,12 @@ class SpriteSelectorItem extends React.PureComponent {
onDragEnd: this.handleDragEnd
});
}
- componentWillUnmount () {
- this.dragRecognizer.reset();
- }
componentDidMount () {
document.addEventListener('touchend', this.handleTouchEnd);
}
componentWillUnmount () {
document.removeEventListener('touchend', this.handleTouchEnd);
+ this.dragRecognizer.reset();
}
getCostumeData () {
if (this.props.costumeURL) return this.props.costumeURL;
--
GitLab