From c20d839a2e0a774bd9b0bac5daf88740dd88ef62 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Thu, 13 Jan 2022 03:56:41 -0800
Subject: [PATCH] applied new context menu to more items

---
 .../views/components/mediaitem-square.ejs     | 103 ++++++++++--------
 src/renderer/views/components/queue.ejs       |   2 +-
 .../views/components/sidebar-playlist.ejs     |   3 +-
 3 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index 1ed8c733..edfe7f87 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -301,6 +301,48 @@
                         ]
                     },
                     normal: {
+                        headerItems: [
+                            {
+                                "icon": "./assets/feather/heart.svg",
+                                "id": "love",
+                                "name": "Love",
+                                "hidden": false,
+                                "disabled": true,
+                                "action": function () {
+                                    app.love(self.item)
+                                }
+                            },
+                            {
+                                "icon": "./assets/feather/heart.svg",
+                                "id": "unlove",
+                                "active": true,
+                                "name": "Unlove",
+                                "hidden": true,
+                                "action": function () {
+                                    app.unlove(self.item)
+                                }
+                            },
+                            {
+                                "icon": "./assets/feather/thumbs-down.svg",
+                                "id": "dislike",
+                                "name": "Dislike",
+                                "hidden": false,
+                                "disabled": true,
+                                "action": function () {
+                                    app.dislike(self.item)
+                                }
+                            },
+                            {
+                                "icon": "./assets/feather/thumbs-down.svg",
+                                "id": "undo_dislike",
+                                "name": "Undo dislike",
+                                "active": true,
+                                "hidden": true,
+                                "action": function () {
+                                    app.unlove(self.item)
+                                }
+                            },
+                        ],
                         items: [
                             {
                                 "icon": "./assets/feather/list.svg",
@@ -344,42 +386,6 @@
                                     ;
                                 }
                             },
-                            {
-                                "icon": "./assets/feather/heart.svg",
-                                "id": "love",
-                                "name": "Love",
-                                "disabled": true,
-                                "action": function () {
-                                    app.love(self.item)
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/unheart.svg",
-                                "id": "unlove",
-                                "name": "Unlove",
-                                "disabled": true,
-                                "action": function () {
-                                    app.unlove(self.item)
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/thumbs-down.svg",
-                                "id": "dislike",
-                                "name": "Dislike",
-                                "disabled": true,
-                                "action": function () {
-                                    app.dislike(self.item)
-                                }
-                            },
-                            {
-                                "icon": "./assets/feather/x-circle.svg",
-                                "id": "undo_dislike",
-                                "name": "Undo dislike",
-                                "disabled": true,
-                                "action": function () {
-                                    app.unlove(self.item)
-                                }
-                            },
                             {
                                 "icon": "./assets/feather/share.svg",
                                 "name": "Share",
@@ -396,14 +402,22 @@
                         return item.id != "addToPlaylist"
                     })
                 }
-                let rating = await app.getRating(self.item)
-                if (rating == 0) {
-                    menus.normal.items.find(x => x.id == 'love').disabled = false
-                    menus.normal.items.find(x => x.id == 'dislike').disabled = false
-                } else if (rating == 1) {
-                    menus.normal.items.find(x => x.id == 'unlove').disabled = false
-                } else if (rating == -1) {
-                    menus.normal.items.find(x => x.id == 'undo_dislike').disabled = false
+                app.showMenuPanel(menus[useMenu], event)
+
+                try{
+                    let rating = await app.getRating(self.item)
+                    if (rating == 0) {
+                        menus.normal.headerItems.find(x => x.id == 'love').disabled = false
+                        menus.normal.headerItems.find(x => x.id == 'dislike').disabled = false
+                    } else if (rating == 1) {
+                        menus.normal.headerItems.find(x => x.id == 'unlove').hidden = false
+                        menus.normal.headerItems.find(x => x.id == 'love').hidden = true
+                    } else if (rating == -1) {
+                        menus.normal.headerItems.find(x => x.id == 'undo_dislike').hidden = false
+                        menus.normal.headerItems.find(x => x.id == 'dislike').hidden = true
+                    }
+                } catch(err) {
+
                 }
 
                 if (this.contextExt) {
@@ -414,7 +428,6 @@
                         menus.multiple.items = menus.multiple.items.concat(this.contextExt.multiple)
                     }
                 }
-                CiderContextMenu.Create(event, menus[useMenu])
             },
         },
         beforeDestroy: function () {
diff --git a/src/renderer/views/components/queue.ejs b/src/renderer/views/components/queue.ejs
index bf883cf2..bfd2abd0 100644
--- a/src/renderer/views/components/queue.ejs
+++ b/src/renderer/views/components/queue.ejs
@@ -113,7 +113,7 @@
                         }]
                     }
                 }
-                CiderContextMenu.Create(event, menus[useMenu]);
+                app.showMenuPanel(menus[useMenu], event);
             },
             playQueueItem(index) {
                 app.mk.changeToMediaAtIndex(index)
diff --git a/src/renderer/views/components/sidebar-playlist.ejs b/src/renderer/views/components/sidebar-playlist.ejs
index 127b7b3c..6756288a 100644
--- a/src/renderer/views/components/sidebar-playlist.ejs
+++ b/src/renderer/views/components/sidebar-playlist.ejs
@@ -134,6 +134,7 @@
                         "addToFavorites": {
                             name: "Add to favorites",
                             disabled: true,
+                            hidden: true,
                             action: () => {
                                 this.addFavorite(playlist_id, "library-playlists")
                             }
@@ -143,7 +144,7 @@
                 if(this.item.type === "library-playlist-folders") {
                     menu.items.addToFavorites.disabled = true
                 }
-                CiderContextMenu.Create(event, menu)
+                app.showMenuPanel(menu, event)
             },
             dragOver(evt) {
                 evt.preventDefault();