Skip to content

Commit

Permalink
Merge pull request #720 from swisnl/fix-issue-717
Browse files Browse the repository at this point in the history
Fix issue 717
  • Loading branch information
bbrala authored May 6, 2020
2 parents c9bcf9b + 745fc69 commit 0dc5897
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 17 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
## Changelog ##

### Unreleased
### 2.9.1

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

### 2.9.0
Expand Down
Binary file modified dist/font/context-menu-icons.eot
Binary file not shown.
Binary file modified dist/font/context-menu-icons.ttf
Binary file not shown.
Binary file modified dist/font/context-menu-icons.woff
Binary file not shown.
Binary file modified dist/font/context-menu-icons.woff2
Binary file not shown.
8 changes: 4 additions & 4 deletions dist/jquery.contextMenu.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
* Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
* Web: http://swisnl.github.io/jQuery-contextMenu/
*
* Copyright (c) 2011-2019 SWIS BV and contributors
* Copyright (c) 2011-2020 SWIS BV and contributors
*
* Licensed under
* MIT License http://www.opensource.org/licenses/mit-license
*
* Date: 2019-10-13T13:09:56.297Z
* Date: 2020-05-06T18:55:06.258Z
*/
@-webkit-keyframes cm-spin {
0% {
Expand Down Expand Up @@ -54,8 +54,8 @@
font-style: normal;
font-weight: normal;

src: url("font/context-menu-icons.eot?4f0ru");
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");
src: url("font/context-menu-icons.eot?33lxn");
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");
}

.context-menu-icon-add:before {
Expand Down
6 changes: 3 additions & 3 deletions dist/jquery.contextMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
* Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
* Web: http://swisnl.github.io/jQuery-contextMenu/
*
* Copyright (c) 2011-2019 SWIS BV and contributors
* Copyright (c) 2011-2020 SWIS BV and contributors
*
* Licensed under
* MIT License http://www.opensource.org/licenses/mit-license
*
* Date: 2019-10-13T13:09:56.900Z
* Date: 2020-05-06T18:55:06.721Z
*/

// jscs:disable
Expand Down Expand Up @@ -461,7 +461,7 @@

// also need to try and focus this element if we're in a contenteditable area,
// as the layer will prevent the browser mouse action we want
if (target.isContentEditable) {
if (target !== null && target.isContentEditable) {
var range = document.createRange(),
sel = window.getSelection();
range.selectNode(target);
Expand Down
6 changes: 3 additions & 3 deletions dist/jquery.contextMenu.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 0dc5897

Please sign in to comment.