Merge branch 'develop'

mopidy_iris/static/app.js

@@ -86568,13 +86568,12 @@ var LibraryBrowseDirectory = function (_React$Component) {
             return _react2.default.createElement(
               'span',
               { key: uri },
-              index > 0 ? _react2.default.createElement(
+              index > 0 && _react2.default.createElement(
                 'span',
                 null,
                 _react2.default.createElement(_Icon2.default, { type: 'fontawesome', name: 'angle-right' }),
-                ' ',
+                '   '
-                '\xA0\xA0'
+              ),
-              ) : null,
               _react2.default.createElement(
                 _URILink2.default,
                 { type: 'browse', uri: uri },
@@ -86654,19 +86653,20 @@ var LibraryBrowseDirectory = function (_React$Component) {
           icon: 'visibility',
           name: 'View',
           value: this.props.view,
+          valueAsLabel: true,
           options: view_options,
           handleChange: function handleChange(value) {
             _this2.props.uiActions.set({ library_directory_view: value });_this2.props.uiActions.hideContextMenu();
           }
         }),
-        tracks ? _react2.default.createElement(
+        tracks && _react2.default.createElement(
           'a',
           { className: 'button button--no-hover', onClick: function onClick(e) {
               _this2.props.uiActions.hideContextMenu();_this2.playAll(e, tracks);
             } },
           _react2.default.createElement(_Icon2.default, { name: 'play_circle_filled' }),
           'Play all'
-        ) : null,
+        ),
         _react2.default.createElement(
           'a',
           { className: 'button button--no-hover', onClick: function onClick(e) {
@@ -86694,11 +86694,11 @@ var LibraryBrowseDirectory = function (_React$Component) {
             null,
             this.renderBreadcrumbs(),
             subdirectories ? this.renderSubdirectories(subdirectories) : null,
-            tracks ? _react2.default.createElement(_TrackList2.default, {
+            tracks && _react2.default.createElement(_TrackList2.default, {
               tracks: this.props.directory.tracks,
               uri: 'iris:browse:' + this.props.uri,
               className: 'library-local-track-list'
-            }) : null
+            })
           )
         )
       );

mopidy_iris/static/index.html

@@ -100,7 +100,7 @@
 
 	// Release details
 	// These are automatically injected to built HTML
-	var build = "1570908071";
+	var build = "1570915071";
 	var version = "3.41.1";
 
 	// Construct the script tag

src/js/views/library/LibraryBrowseDirectory.js

@@ -82,18 +82,17 @@ class LibraryBrowseDirectory extends React.Component {
 					  }
 
 					  return (
-  <span key={uri}>
+              <span key={uri}>
-    {index > 0 ? (
+                {index > 0 && (
-      <span>
+                  <span>
-        <Icon type="fontawesome" name="angle-right" />
+                    <Icon type="fontawesome" name="angle-right" />
-        {' '}
+                    {'   '}
-&nbsp;&nbsp;
+                  </span>
-      </span>
+                )}
-    ) : null}
+                <URILink type="browse" uri={uri}>
-    <URILink type="browse" uri={uri}>
+                  {decodeURI(uri_element)}
-      {decodeURI(uri_element)}
+                </URILink>
-    </URILink>
+              </span>
-  </span>
 					  );
           })}
         </h4>
@@ -118,16 +117,16 @@ class LibraryBrowseDirectory extends React.Component {
     return (
       <div className="grid category-grid">
         {
-						subdirectories.map((subdirectory) => (
+          subdirectories.map((subdirectory) => (
-  <GridItem
+            <GridItem
-    key={subdirectory.uri}
+              key={subdirectory.uri}
-    type="browse"
+              type="browse"
-    link={`/library/browse/${encodeURIComponent(subdirectory.uri)}`}
+              link={`/library/browse/${encodeURIComponent(subdirectory.uri)}`}
-    item={subdirectory}
+              item={subdirectory}
-    nocontext
+              nocontext
-  />
+            />
-						))
+          ))
-					}
+        }
       </div>
     );
   }
@@ -172,18 +171,19 @@ class LibraryBrowseDirectory extends React.Component {
           icon="visibility"
           name="View"
           value={this.props.view}
+          valueAsLabel
           options={view_options}
           handleChange={(value) => { this.props.uiActions.set({ library_directory_view: value }); this.props.uiActions.hideContextMenu(); }}
         />
-        {tracks ? (
+        {tracks && (
           <a className="button button--no-hover" onClick={(e) => { this.props.uiActions.hideContextMenu(); this.playAll(e, tracks); }}>
             <Icon name="play_circle_filled" />
-Play all
+            Play all
           </a>
-        ) : null }
+        )}
         <a className="button button--no-hover" onClick={(e) => { this.props.uiActions.hideContextMenu(); this.goBack(e); }}>
           <Icon name="keyboard_backspace" />
-Back
+          Back
         </a>
       </span>
     );
@@ -201,13 +201,13 @@ Back
 
             {subdirectories ? this.renderSubdirectories(subdirectories) : null}
 
-            {tracks ? (
+            {tracks && (
               <TrackList
                 tracks={this.props.directory.tracks}
                 uri={`iris:browse:${this.props.uri}`}
                 className="library-local-track-list"
               />
-            ) : null }
+            )}
 
           </ErrorBoundary>
         </section>