From a8a47b86a9f85ddb104d254abab95140a77a3ad3 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Thu, 9 Mar 2017 08:54:06 +1300
Subject: [PATCH] Simplifying support for touchhold (not in progress)

---
 src/js/components/TrackList.js | 35 +++++++++-------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/js/components/TrackList.js b/src/js/components/TrackList.js
index eae2096a..a9424f4a 100755
--- a/src/js/components/TrackList.js
+++ b/src/js/components/TrackList.js
@@ -74,7 +74,13 @@ class TrackList extends React.Component{
 			this._touch_x > ( pageX - this._touch_threshold ) &&
 			this._touch_y < ( pageY + this._touch_threshold ) &&
 			this._touch_y > ( pageY - this._touch_threshold ) ){
-				this.handleTouchContextMenu(e,index)
+
+				// toggle selection
+				var tracks = this.state.tracks
+				tracks[index].selected = !tracks[index].selected
+				this.setState({ tracks: tracks, lastSelectedTrack: index })
+
+				//this.handleContextMenu(e)
 		}
 
 		e.preventDefault()
@@ -122,7 +128,7 @@ class TrackList extends React.Component{
 		}
 	}
 
-	handleContextMenu(e,index){
+	handleContextMenu(e){
 		var selected_tracks = this.selectedTracks()
 		var data = {
 			e: e,
@@ -135,29 +141,6 @@ class TrackList extends React.Component{
 		this.props.uiActions.showContextMenu(data)
 	}
 
-	handleTouchContextMenu(e,index){
-
-		// toggle selection
-		var tracks = this.state.tracks
-		tracks[index].selected = !tracks[index].selected
-		this.setState({ tracks: tracks, lastSelectedTrack: index })
-
-		// update our context menu to hide/show
-		var selected_tracks = this.selectedTracks()
-		if( selected_tracks.length > 0 ){
-			var data = {
-				context: (this.props.context ? this.props.context : 'track'),
-				tracklist_uri: (this.props.uri ? this.props.uri : null),
-				items: selected_tracks,
-				uris: helpers.asURIs(selected_tracks),
-				indexes: this.tracksIndexes(selected_tracks)
-			}
-			this.props.uiActions.showTouchContextMenu(data)
-		}else{
-			this.props.uiActions.hideTouchContextMenu()
-		}
-	}
-
 	toggleTrackSelections(e,index){
 		var tracks = this.state.tracks
 		var lastSelectedTrack = this.state.lastSelectedTrack
@@ -323,7 +306,7 @@ class TrackList extends React.Component{
 									handleMouseDown={ e => self.handleMouseDown(e, index)}
 									handleTouchStart={ e => self.handleTouchStart(e, index)}
 									handleTouchEnd={ e => self.handleTouchEnd(e, index)}
-									handleContextMenu={ e => self.handleContextMenu(e, index)} />
+									handleContextMenu={ e => self.handleContextMenu(e)} />
 						}
 					)
 				}