From 289b2520665587116611f8ef1d26ab5c658f19b0 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 16 Jul 2016 18:26:21 -0400 Subject: [PATCH] update context menu --- .../emby-webcomponents/.bower.json | 8 ++-- .../emby-webcomponents/itemcontextmenu.js | 41 ++++++++++++++++++- .../emby-webcomponents/strings/en-US.json | 5 ++- .../bower_components/iron-meta/.bower.json | 6 +-- .../bower_components/polymer/.bower.json | 2 +- 5 files changed, 52 insertions(+), 10 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index d4c9e4bbb8..606524bebb 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -15,12 +15,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.85", - "_release": "1.4.85", + "version": "1.4.86", + "_release": "1.4.86", "_resolution": { "type": "version", - "tag": "1.4.85", - "commit": "02ae5393a31e8266eb52f0e1a6471b9da8f964c7" + "tag": "1.4.86", + "commit": "ddbdeddbe5f3fec3e7024a009077256d14f2ec0b" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js b/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js index 40f84a5375..526adedd41 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js +++ b/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js @@ -1,4 +1,4 @@ -define(['apphost', 'globalize', 'connectionManager', 'itemHelper'], function (appHost, globalize, connectionManager, itemHelper) { +define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter'], function (appHost, globalize, connectionManager, itemHelper, embyRouter) { function getCommands(options) { @@ -48,6 +48,13 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper'], function (ap }); } + if (options.open !== false) { + commands.push({ + name: globalize.translate('Open'), + id: 'open' + }); + } + if (user.Policy.IsAdministrator) { commands.push({ @@ -63,6 +70,20 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper'], function (ap }); } + if (options.openAlbum !== false && item.AlbumId) { + commands.push({ + name: Globalize.translate('ViewAlbum'), + id: 'album' + }); + } + + if (options.openArtist !== false && item.ArtistItems && item.ArtistItems.length) { + commands.push({ + name: Globalize.translate('ViewArtist'), + id: 'artist' + }); + } + return commands; }); } @@ -135,6 +156,12 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper'], function (ap reject(); break; } + case 'open': + { + embyRouter.showItem(item); + reject(); + break; + } case 'delete': { deleteItem(apiClient, itemId).then(function () { @@ -153,6 +180,18 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper'], function (ap }); break; } + case 'album': + { + embyRouter.showItem(item.AlbumId, item.ServerId); + reject(); + break; + } + case 'artist': + { + embyRouter.showItem(item.ArtistItems[0].Id, item.ServerId); + reject(); + break; + } default: reject(); break; diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json index 6c0b40d0e1..afdf8b5788 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json @@ -98,5 +98,8 @@ "Like": "Like", "Dislike": "Dislike", "Played": "Played", - "RefreshDialogHelp": "Metadata is refreshed based on settings and internet services that are enabled in the Emby Server dashboard." + "RefreshDialogHelp": "Metadata is refreshed based on settings and internet services that are enabled in the Emby Server dashboard.", + "Open": "Open", + "ViewAlbum": "View Album", + "ViewArtist": "View Artist" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index f4bfef4a7c..e1304d174b 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -26,14 +26,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "main": "iron-meta.html", - "homepage": "https://github.com/polymerelements/iron-meta", + "homepage": "https://github.com/PolymerElements/iron-meta", "_release": "1.1.1", "_resolution": { "type": "version", "tag": "v1.1.1", "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" }, - "_source": "git://github.com/polymerelements/iron-meta.git", + "_source": "git://github.com/PolymerElements/iron-meta.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-meta" + "_originalSource": "PolymerElements/iron-meta" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index 36ef2ed872..5320b592cc 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -39,6 +39,6 @@ "commit": "8715c83bf04a228de00ec662ed43eb6141e61b91" }, "_source": "git://github.com/Polymer/polymer.git", - "_target": "^1.0.0", + "_target": "^1.1.0", "_originalSource": "Polymer/polymer" } \ No newline at end of file