Skip to content

Commit 8ee0634

Browse files
committed
Changed to use jQuery object that is passed in
We should use the jQuery object that has been passed into contextMenu's IIFE in case the global jQuery name has been freed by jQuery.noConflict( true )
1 parent a25b3a7 commit 8ee0634

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/jquery.contextMenu.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ var // currently active contextMenu trigger
252252
click: function(e) {
253253
e.preventDefault();
254254
e.stopImmediatePropagation();
255-
$(this).trigger(jQuery.Event("contextmenu", { data: e.data, pageX: e.pageX, pageY: e.pageY }));
255+
$(this).trigger($.Event("contextmenu", { data: e.data, pageX: e.pageX, pageY: e.pageY }));
256256
},
257257
// contextMenu right-click trigger
258258
mousedown: function(e) {
@@ -277,7 +277,7 @@ var // currently active contextMenu trigger
277277
e.preventDefault();
278278
e.stopImmediatePropagation();
279279
$currentTrigger = $this;
280-
$this.trigger(jQuery.Event("contextmenu", { data: e.data, pageX: e.pageX, pageY: e.pageY }));
280+
$this.trigger($.Event("contextmenu", { data: e.data, pageX: e.pageX, pageY: e.pageY }));
281281
}
282282

283283
$this.removeData('contextMenuActive');
@@ -306,7 +306,7 @@ var // currently active contextMenu trigger
306306
hoveract.timer = null;
307307
$document.off('mousemove.contextMenuShow');
308308
$currentTrigger = $this;
309-
$this.trigger(jQuery.Event("contextmenu", { data: hoveract.data, pageX: hoveract.pageX, pageY: hoveract.pageY }));
309+
$this.trigger($.Event("contextmenu", { data: hoveract.data, pageX: hoveract.pageX, pageY: hoveract.pageY }));
310310
}, e.data.delay );
311311
},
312312
// contextMenu hover trigger
@@ -1176,7 +1176,7 @@ $.fn.contextMenu = function(operation) {
11761176
if (operation === undefined) {
11771177
this.first().trigger('contextmenu');
11781178
} else if (operation.x && operation.y) {
1179-
this.first().trigger(jQuery.Event("contextmenu", {pageX: operation.x, pageY: operation.y}));
1179+
this.first().trigger($.Event("contextmenu", {pageX: operation.x, pageY: operation.y}));
11801180
} else if (operation === "hide") {
11811181
var $menu = this.data('contextMenu').$menu;
11821182
$menu && $menu.trigger('contextmenu:hide');

0 commit comments

Comments
 (0)