diff --git a/electron.js b/electron.js index 7a5d78670b..5e59950d60 100644 --- a/electron.js +++ b/electron.js @@ -41,7 +41,7 @@ let csp = [ "style-src 'unsafe-inline' http://localhost:*", "font-src data:", "connect-src http://localhost:* http://127.0.0.1:* ws://localhost:* https://sentry.anytype.io https://anytype.io https://api.amplitude.com/ devtools://devtools data:", - "script-src-elem http://localhost:* https://sentry.io devtools://devtools 'unsafe-inline'", + "script-src-elem file: http://localhost:* https://sentry.io devtools://devtools 'unsafe-inline'", "frame-src chrome-extension://react-developer-tools" ]; let autoUpdate = false; diff --git a/src/scss/menu/thread.scss b/src/scss/menu/thread.scss index 3dc28cf439..199f5b65e7 100644 --- a/src/scss/menu/thread.scss +++ b/src/scss/menu/thread.scss @@ -19,6 +19,7 @@ } .menu.menuThreadStatus { + .content { max-height: 250px; } .item { padding: 5px 16px; } } diff --git a/src/ts/component/menu/thread/list.tsx b/src/ts/component/menu/thread/list.tsx index 2822930b6d..862e3cc846 100644 --- a/src/ts/component/menu/thread/list.tsx +++ b/src/ts/component/menu/thread/list.tsx @@ -20,7 +20,6 @@ class MenuThreadList extends React.Component { super(props); this.onMouseEnter = this.onMouseEnter.bind(this); - this.onMouseLeave = this.onMouseLeave.bind(this); }; render () { @@ -36,7 +35,6 @@ class MenuThreadList extends React.Component { id={'item-' + item.id} className="item" onMouseEnter={(e: any) => { this.onMouseEnter(item.id, false); }} - onMouseLeave={this.onMouseLeave} >
@@ -57,7 +55,6 @@ class MenuThreadList extends React.Component { id="item-cafe" className="item" onMouseOver={(e: any) => { this.onMouseEnter('cafe', true); }} - onMouseLeave={this.onMouseLeave} >
@@ -84,9 +81,11 @@ class MenuThreadList extends React.Component { obj.unbind('mouseleave').on('mouseleave', () => { window.clearTimeout(this.timeoutClose); this.timeoutClose = window.setTimeout(() => { - window.clearTimeout(this.timeoutMenu); - commonStore.menuClose(this.props.id); - commonStore.menuClose('threadStatus'); + if (!commonStore.menuIsOpen('threadStatus')) { + window.clearTimeout(this.timeoutMenu); + commonStore.menuClose(this.props.id); + commonStore.menuClose('threadStatus'); + }; }, 1000); }); }; @@ -132,10 +131,6 @@ class MenuThreadList extends React.Component { }, Constant.delay.menu); }; - onMouseLeave (e: any) { - commonStore.menuClose('threadStatus'); - }; - }; export default MenuThreadList; \ No newline at end of file