secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
James Barnsley
2021-04-07 12:32:00 +12:00
parent 9d36d6b627 9c903a3fe9
commit c40c91a9a1
10 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
IRIS_VERSION
View File

@ -1 +1 @@
3.57.4
3.57.5

2
mopidy_iris/__init__.py
View File

@ -3,7 +3,7 @@ import pathlib
from mopidy import config, ext
__version__ = "3.57.4"
__version__ = "3.57.5"
logger = logging.getLogger(__name__)

8
mopidy_iris/static/app.js
View File

@ -135391,7 +135391,7 @@ var ContextMenu = /*#__PURE__*/function (_React$Component) {
menu = _this$props3.menu,
hideContextMenu = _this$props3.uiActions.hideContextMenu;
if (menu && $(e.target).closest('.context-menu').length <= 0 && $(e.target).closest('.context-menu-trigger').length <= 0) {
if (menu && $(e.target).closest('.context-menu').length <= 0 && $(e.target).closest('.context-menu-trigger').length <= 0 && !((e.which === 3 || e.button === 2) && ($(e.target).closest('.grid__item').length > 0 || $(e.target).closest('.list__item').length > 0))) {
hideContextMenu();
}
});
@ -136668,6 +136668,12 @@ var ContextMenu = /*#__PURE__*/function (_React$Component) {
"data-qa-file": "ContextMenu"
}), copy_uris, refresh);
case 'directory':
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
"data-qa-node": "div",
"data-qa-file": "ContextMenu"
}, copy_uris);
default:
return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", {
"data-qa-node": "div",

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

2
mopidy_iris/static/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
mopidy_iris/static/index.html
View File

@ -106,8 +106,8 @@
// Release details
// These are automatically injected to built HTML
var build = "1617504969";
var version = "3.57.4";
var build = "1617608354";
var version = "3.57.5";
// Construct the script tag
var js = document.createElement("script");

2
mopidy_iris/static/manifest.json
View File

@ -1,5 +1,5 @@
{
"manifest_version": "3.57.4",
"manifest_version": "3.57.5",
"short_name": "Iris",
"name": "Iris",
"icons": [

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "mopidy-iris",
"version": "3.57.4",
"version": "3.57.5",
"description": "Mopidy HTTP interface",
"repository": "https://github.com/jaedb/iris",
"author": "James Barnsley <james@barnsley.nz>",

2
setup.cfg
View File

@ -1,6 +1,6 @@
[metadata]
name = Mopidy-Iris
version = 3.57.4
version = 3.57.5
url = https://github.com/jaedb/iris
author = James Barnsley
author_email = james@barnsley.nz

19
src/js/components/ContextMenu.js
View File

@ -158,7 +158,18 @@ class ContextMenu extends React.Component {
handleMouseDown = (e) => {
const { menu, uiActions: { hideContextMenu } } = this.props;
if (menu && $(e.target).closest('.context-menu').length <= 0 && $(e.target).closest('.context-menu-trigger').length <= 0) {
if (
menu
&& $(e.target).closest('.context-menu').length <= 0
&& $(e.target).closest('.context-menu-trigger').length <= 0
&& !(
(e.which === 3 || e.button === 2) &&
(
$(e.target).closest('.grid__item').length > 0
|| $(e.target).closest('.list__item').length > 0
)
)
) {
hideContextMenu();
}
}
@ -1257,6 +1268,12 @@ class ContextMenu extends React.Component {
{refresh}
</div>
);
case 'directory':
return (
<div>
{copy_uris}
</div>
);
default:
return (
<div>