Skip to content

Commit 0dc5897

Browse files
authored
Merge pull request #720 from swisnl/fix-issue-717
Fix issue 717
2 parents c9bcf9b + 745fc69 commit 0dc5897

14 files changed

+18
-17
lines changed

Diff for: CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
## Changelog ##
22

3-
### Unreleased
3+
### 2.9.1
44

5+
* Fix error when closing the menu by clicking on the page without any element under that click point. (fixes #717)
56
* Upgrades dependencies
67

78
### 2.9.0

Diff for: dist/font/context-menu-icons.eot

0 Bytes
Binary file not shown.

Diff for: dist/font/context-menu-icons.ttf

0 Bytes
Binary file not shown.

Diff for: dist/font/context-menu-icons.woff

0 Bytes
Binary file not shown.

Diff for: dist/font/context-menu-icons.woff2

-8 Bytes
Binary file not shown.

Diff for: dist/jquery.contextMenu.css

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
* Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
88
* Web: http://swisnl.github.io/jQuery-contextMenu/
99
*
10-
* Copyright (c) 2011-2019 SWIS BV and contributors
10+
* Copyright (c) 2011-2020 SWIS BV and contributors
1111
*
1212
* Licensed under
1313
* MIT License http://www.opensource.org/licenses/mit-license
1414
*
15-
* Date: 2019-10-13T13:09:56.297Z
15+
* Date: 2020-05-06T18:55:06.258Z
1616
*/
1717
@-webkit-keyframes cm-spin {
1818
0% {
@@ -54,8 +54,8 @@
5454
font-style: normal;
5555
font-weight: normal;
5656

57-
src: url("font/context-menu-icons.eot?4f0ru");
58-
src: url("font/context-menu-icons.eot?4f0ru#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?4f0ru") format("woff2"), url("font/context-menu-icons.woff?4f0ru") format("woff"), url("font/context-menu-icons.ttf?4f0ru") format("truetype");
57+
src: url("font/context-menu-icons.eot?33lxn");
58+
src: url("font/context-menu-icons.eot?33lxn#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?33lxn") format("woff2"), url("font/context-menu-icons.woff?33lxn") format("woff"), url("font/context-menu-icons.ttf?33lxn") format("truetype");
5959
}
6060

6161
.context-menu-icon-add:before {

Diff for: dist/jquery.contextMenu.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
77
* Web: http://swisnl.github.io/jQuery-contextMenu/
88
*
9-
* Copyright (c) 2011-2019 SWIS BV and contributors
9+
* Copyright (c) 2011-2020 SWIS BV and contributors
1010
*
1111
* Licensed under
1212
* MIT License http://www.opensource.org/licenses/mit-license
1313
*
14-
* Date: 2019-10-13T13:09:56.900Z
14+
* Date: 2020-05-06T18:55:06.721Z
1515
*/
1616

1717
// jscs:disable
@@ -461,7 +461,7 @@
461461

462462
// also need to try and focus this element if we're in a contenteditable area,
463463
// as the layer will prevent the browser mouse action we want
464-
if (target.isContentEditable) {
464+
if (target !== null && target.isContentEditable) {
465465
var range = document.createRange(),
466466
sel = window.getSelection();
467467
range.selectNode(target);

Diff for: dist/jquery.contextMenu.min.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)