Fix #190

trazyn · Jul 2, 2018 · b09c293 · b09c293
1 parent d5d4262
commit b09c293
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/js/components/Controller/index.js b/src/js/components/Controller/index.js
@@ -22,7 +22,7 @@ import { PLAYER_LOOP, PLAYER_SHUFFLE, PLAYER_REPEAT } from 'stores/controller';
     like: stores.me.like,
     unlike: stores.me.unlike,
     getPlayerLink: () => {
-        return stores.controller.playlist.link;
+        return stores.controller.playlist.link || '/';
     },
     getPlaylistName: () => {
         return `🎉 ${stores.controller.playlist.name}`;
@@ -81,7 +81,15 @@ class Controller extends Component {
                     <Link
                         className="tooltip"
                         data-text={getPlaylistName()}
-                        to={getPlayerLink()}>
+                        to={getPlayerLink()}
+                        onClick={
+                            e => {
+                                if (e.currentTarget.href.endsWith('#/')) {
+                                    e.preventDefault();
+                                }
+                            }
+                        }
+                    >
                         <ProgressImage {...{
                             height: 50,
                             width: 50,

diff --git a/src/js/pages/Home/index.js b/src/js/pages/Home/index.js
@@ -114,7 +114,13 @@ class Home extends Component {
                 className={clazz('clearfix', classes.daily, {
                     [classes.playing]: playing,
                 })}
-                onClick={e => canitoggle(item.id) ? toggle() : play(item)}>
+                onClick={
+                    e => {
+                        canitoggle(item.id) ? toggle() : play(item);
+                        this.forceUpdate();
+                    }
+                }
+            >
                 <div className={classes.mask}>
                     {
                         playing