Skip to content

Commit b18884c

Browse files
committed
Merge branch 'wizzard0-master'
2 parents 8ce0692 + b7dee65 commit b18884c

13 files changed

+15
-17
lines changed

dist/font/context-menu-icons.eot

0 Bytes
Binary file not shown.

dist/font/context-menu-icons.ttf

0 Bytes
Binary file not shown.

dist/font/context-menu-icons.woff

0 Bytes
Binary file not shown.

dist/font/context-menu-icons.woff2

4 Bytes
Binary file not shown.

dist/jquery.contextMenu.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Licensed under
1313
* MIT License http://www.opensource.org/licenses/mit-license
1414
*
15-
* Date: 2017-05-05T14:40:37.763Z
15+
* Date: 2017-05-25T11:09:28.464Z
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?lnvb");
58-
src: url("font/context-menu-icons.eot?lnvb#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?lnvb") format("woff2"), url("font/context-menu-icons.woff?lnvb") format("woff"), url("font/context-menu-icons.ttf?lnvb") format("truetype");
57+
src: url("font/context-menu-icons.eot?2w46d");
58+
src: url("font/context-menu-icons.eot?2w46d#iefix") format("embedded-opentype"), url("font/context-menu-icons.woff2?2w46d") format("woff2"), url("font/context-menu-icons.woff?2w46d") format("woff"), url("font/context-menu-icons.ttf?2w46d") format("truetype");
5959
}
6060

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

dist/jquery.contextMenu.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Licensed under
1212
* MIT License http://www.opensource.org/licenses/mit-license
1313
*
14-
* Date: 2017-05-05T14:40:36.990Z
14+
* Date: 2017-05-25T11:09:28.700Z
1515
*/
1616

1717
// jscs:disable
@@ -891,7 +891,7 @@
891891
}
892892

893893
// hide menu if callback doesn't stop that
894-
if (callback.call(root.$trigger, key, root) !== false) {
894+
if (callback.call(root.$trigger, key, root, e) !== false) {
895895
root.$menu.trigger('contextmenu:hide');
896896
} else if (root.$menu.parent().length) {
897897
op.update.call(root.$trigger, root);

dist/jquery.contextMenu.min.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)