Skip to content

Commit

Permalink
Regenerate dist
Browse files Browse the repository at this point in the history
  • Loading branch information
bbrala committed Nov 29, 2018
1 parent fd1571e commit 2c8a397
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 11 deletions.
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.
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.7.0
* Version: v2.7.1
*
* 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: 2018-10-02T14:29:27.829Z
* Date: 2018-11-29T10:56:47.812Z
*/
@-webkit-keyframes cm-spin {
0% {
Expand Down
12 changes: 9 additions & 3 deletions dist/jquery.contextMenu.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* jQuery contextMenu v2.7.0 - Plugin for simple contextMenu handling
* jQuery contextMenu v2.7.1 - Plugin for simple contextMenu handling
*
* Version: v2.7.0
* Version: v2.7.1
*
* 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: 2018-10-02T14:29:27.777Z
* Date: 2018-11-29T10:56:47.758Z
*/

// jscs:disable
Expand Down Expand Up @@ -239,6 +239,7 @@
},
// events
events: {
preShow: $.noop,
show: $.noop,
hide: $.noop,
activated: $.noop
Expand Down Expand Up @@ -278,6 +279,11 @@
// contextmenu show dispatcher
contextmenu: function (e) {
var $this = $(this);

//Show browser context-menu when preShow returns false
if (e.data.events.preShow($this,e) === false) {
return;
}

// disable actual context-menu if we are using the right mouse button as the trigger
if (e.data.trigger === 'right') {
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 2c8a397

Please sign in to comment.