Removing playlist sorting - needs a more complete solution

jaedb · Nov 2, 2020 · 1545bcb · 1545bcb
1 parent 9b2a38d
commit 1545bcb
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 70 deletions.
diff --git a/IRIS_VERSION b/IRIS_VERSION
@@ -1 +1 @@
-3.53.0
+3.53.1
diff --git a/mopidy_iris/__init__.py b/mopidy_iris/__init__.py
@@ -3,7 +3,7 @@
 
 from mopidy import config, ext
 
-__version__ = "3.53.0"
+__version__ = "3.53.1"
 
 logger = logging.getLogger(__name__)
 

diff --git a/mopidy_iris/static/app.js b/mopidy_iris/static/app.js
diff --git a/mopidy_iris/static/app.js.map b/mopidy_iris/static/app.js.map
diff --git a/mopidy_iris/static/app.min.js b/mopidy_iris/static/app.min.js
diff --git a/mopidy_iris/static/index.html b/mopidy_iris/static/index.html
@@ -106,8 +106,8 @@
 
 	// Release details
 	// These are automatically injected to built HTML
-	var build = "1604224903";
-	var version = "3.53.0";
+	var build = "1604338606";
+	var version = "3.53.1";
 
 	// Construct the script tag
 	var js = document.createElement("script");

diff --git a/mopidy_iris/static/manifest.json b/mopidy_iris/static/manifest.json
@@ -1,5 +1,5 @@
 {
-  "manifest_version": "3.53.0",
+  "manifest_version": "3.53.1",
   "short_name": "Iris",
   "name": "Iris",
   "icons": [

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mopidy-iris",
-  "version": "3.53.0",
+  "version": "3.53.1",
   "description": "Mopidy HTTP interface",
   "repository": "https://github.com/jaedb/iris",
   "author": "James Barnsley <[email protected]>",

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = Mopidy-Iris
-version = 3.53.0
+version = 3.53.1
 url = https://github.com/jaedb/iris
 author = James Barnsley
 author_email = [email protected]

diff --git a/src/js/locale/en.yaml b/src/js/locale/en.yaml
@@ -341,8 +341,6 @@ settings:
       wide_scrollbars: Use wide scrollbars
       grid_glow: Thumbnail glow effect
       grid_glow_tooltip: Disable effect for lower-power devices or older browsers
-      reverse_playlist_tracks: Reverse playlist tracks
-      reverse_playlist_tracks_tooltip: Sort tracks, most recently-added first
     sources_priority:
       label: Sources priority
       description: Drag-and-drop to prioritize search providers and results

diff --git a/src/js/views/Playlist.js b/src/js/views/Playlist.js
@@ -274,7 +274,6 @@ class Playlist extends React.Component {
       playlist,
       loading,
       slim_mode,
-      reverse_playlist_tracks,
     } = this.props;
 
     if (!playlist) {
@@ -295,8 +294,6 @@ class Playlist extends React.Component {
       context = 'editable-playlist';
     }
 
-    const tracks = reverse_playlist_tracks ? sortItems(playlist.tracks, '', true) : playlist.tracks;
-
     return (
       <div className="view playlist-view content-wrapper preserve-3d">
 
@@ -355,7 +352,7 @@ class Playlist extends React.Component {
             uri={playlist.uri}
             className="playlist-track-list"
             track_context={context}
-            tracks={tracks}
+            tracks={playlist.tracks}
             removeTracks={this.removeTracks}
             reorderTracks={this.reorderTracks}
           />
@@ -373,7 +370,6 @@ const mapStateToProps = (state, ownProps) => {
       allow_reporting,
       slim_mode,
       theme,
-      reverse_playlist_tracks,
     } = {},
     spotify: {
       library_playlists: spotify_library_playlists,
@@ -401,7 +397,6 @@ const mapStateToProps = (state, ownProps) => {
     local_library_playlists,
     spotify_authorized,
     spotify_userid: (me && me.id) || null,
-    reverse_playlist_tracks,
   };
 };
 

diff --git a/src/js/views/Settings.js b/src/js/views/Settings.js
@@ -387,20 +387,6 @@ class Settings extends React.Component {
                   </span>
                 </span>
               </label>
-              <label>
-                <input
-                  type="checkbox"
-                  name="reverse_playlist_tracks"
-                  checked={ui.reverse_playlist_tracks}
-                  onChange={() => uiActions.set({ reverse_playlist_tracks: !ui.reverse_playlist_tracks })}
-                />
-                <span className="label tooltip">
-                  <I18n path="settings.interface.behavior.reverse_playlist_tracks" />
-                  <span className="tooltip__content">
-                    <I18n path="settings.interface.behavior.reverse_playlist_tracks_tooltip" />
-                  </span>
-                </span>
-              </label>
             </div>
           </div>