Skip to content

Commit

Permalink
Merge branch 'Rhain-patch-1'
Browse files Browse the repository at this point in the history
  • Loading branch information
bbrala committed May 13, 2020
2 parents 0dc5897 + 2c2ae56 commit b755eec
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 104 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## Changelog ##

### 2.9.2

* Fix reflow when adding click layer to page (fixed #721, thanks @Rhain)

### 2.9.1

* Fix error when closing the menu by clicking on the page without any element under that click point. (fixes #717)
Expand Down
4 changes: 2 additions & 2 deletions dist/jquery.contextMenu.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/*!
* jQuery contextMenu - Plugin for simple contextMenu handling
*
* Version: v2.9.0
* Version: v2.9.2
*
* Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
* Web: http://swisnl.github.io/jQuery-contextMenu/
Expand All @@ -12,7 +12,7 @@
* Licensed under
* MIT License http://www.opensource.org/licenses/mit-license
*
* Date: 2020-05-06T18:55:06.258Z
* Date: 2020-05-13T13:55:37.023Z
*/
@-webkit-keyframes cm-spin {
0% {
Expand Down
10 changes: 5 additions & 5 deletions dist/jquery.contextMenu.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* jQuery contextMenu v2.9.0 - Plugin for simple contextMenu handling
* jQuery contextMenu v2.9.2 - Plugin for simple contextMenu handling
*
* Version: v2.9.0
* Version: v2.9.2
*
* Authors: Björn Brala (SWIS.nl), Rodney Rehm, Addy Osmani (patches for FF)
* Web: http://swisnl.github.io/jQuery-contextMenu/
Expand All @@ -11,7 +11,7 @@
* Licensed under
* MIT License http://www.opensource.org/licenses/mit-license
*
* Date: 2020-05-06T18:55:06.721Z
* Date: 2020-05-13T13:55:36.983Z
*/

// jscs:disable
Expand Down Expand Up @@ -1505,15 +1505,15 @@
width: $win.width(),
display: 'block',
position: 'fixed',
'z-index': zIndex,
'z-index': zIndex - 1,
top: 0,
left: 0,
opacity: 0,
filter: 'alpha(opacity=0)',
'background-color': '#000'
})
.data('contextMenuRoot', opt)
.insertBefore(this)
.appendTo(document.body)
.on('contextmenu', handle.abortevent)
.on('mousedown', handle.layerClick);

Expand Down
4 changes: 2 additions & 2 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 b755eec

Please sign in to comment.