Skip to content

Commit 799fb77

Browse files
committed
making variable names more descriptive.
1 parent c18b3f3 commit 799fb77

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

src/jquery.contextMenu.js

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -782,31 +782,31 @@ var // currently active contextMenu trigger
782782
// operations
783783
op = {
784784
show: function(opt, x, y) {
785-
var $this = $(this),
785+
var $trigger = $(this),
786786
offset,
787787
css = {};
788788

789789
// hide any open menus
790790
$('#context-menu-layer').trigger('mousedown');
791791

792792
// backreference for callbacks
793-
opt.$trigger = $this;
793+
opt.$trigger = $trigger;
794794

795795
// show event
796-
if (opt.events.show.call($this, opt) === false) {
796+
if (opt.events.show.call($trigger, opt) === false) {
797797
$currentTrigger = null;
798798
return;
799799
}
800800

801801
// create or update context menu
802-
op.update.call($this, opt);
802+
op.update.call($trigger, opt);
803803

804804
// position menu
805-
opt.position.call($this, opt, x, y);
805+
opt.position.call($trigger, opt, x, y);
806806

807807
// make sure we're in front
808808
if (opt.zIndex) {
809-
css.zIndex = zindex($this) + opt.zIndex;
809+
css.zIndex = zindex($trigger) + opt.zIndex;
810810
}
811811

812812
// add layer
@@ -818,15 +818,15 @@ var // currently active contextMenu trigger
818818
// position and show context menu
819819
opt.$menu.css( css )[opt.animation.show](opt.animation.duration);
820820
// make options available
821-
$this.data('contextMenu', opt);
821+
$trigger.data('contextMenu', opt);
822822
// register key handler
823823
$(document).off('keydown.contextMenu').on('keydown.contextMenu', handle.key);
824824
// register autoHide handler
825825
if (opt.autoHide) {
826826
// trigger element coordinates
827-
var pos = $this.position();
828-
pos.right = pos.left + $this.outerWidth();
829-
pos.bottom = pos.top + this.outerHeight();
827+
var pos = $trigger.position();
828+
pos.right = pos.left + $trigger.outerWidth();
829+
pos.bottom = pos.top + $trigger.outerHeight();
830830
// mouse position handler
831831
$(document).on('mousemove.contextMenuAutoHide', function(e) {
832832
if (opt.$layer && !opt.hovering && (!(e.pageX >= pos.left && e.pageX <= pos.right) || !(e.pageY >= pos.top && e.pageY <= pos.bottom))) {
@@ -837,19 +837,20 @@ var // currently active contextMenu trigger
837837
}
838838
},
839839
hide: function(opt, force) {
840-
var $this = $(this);
840+
var $trigger = $(this);
841841
if (!opt) {
842-
opt = $this.data('contextMenu') || {};
842+
opt = $trigger.data('contextMenu') || {};
843843
}
844844

845845
// hide event
846-
if (!force && opt.events && opt.events.hide.call($this, opt) === false) {
846+
if (!force && opt.events && opt.events.hide.call($trigger, opt) === false) {
847847
return;
848848
}
849849

850850
if (opt.$layer) {
851851
// keep layer for a bit so the contextmenu event can be aborted properly by opera
852-
setTimeout((function($layer){ return function(){
852+
setTimeout((function($layer) {
853+
return function(){
853854
$layer.remove();
854855
};
855856
})(opt.$layer), 10);
@@ -1096,7 +1097,7 @@ var // currently active contextMenu trigger
10961097
}
10971098
},
10981099
update: function(opt, root) {
1099-
var $this = this;
1100+
var $trigger = this;
11001101
if (root === undefined) {
11011102
root = opt;
11021103
op.resize(opt.$menu);
@@ -1106,7 +1107,7 @@ var // currently active contextMenu trigger
11061107
var $item = $(this),
11071108
key = $item.data('contextMenuKey'),
11081109
item = opt.items[key],
1109-
disabled = ($.isFunction(item.disabled) && item.disabled.call($this, key, root)) || item.disabled === true;
1110+
disabled = ($.isFunction(item.disabled) && item.disabled.call($trigger, key, root)) || item.disabled === true;
11101111

11111112
// dis- / enable item
11121113
$item[disabled ? 'addClass' : 'removeClass']('disabled');
@@ -1135,7 +1136,7 @@ var // currently active contextMenu trigger
11351136

11361137
if (item.$menu) {
11371138
// update sub-menu
1138-
op.update.call($this, item, root);
1139+
op.update.call($trigger, item, root);
11391140
}
11401141
});
11411142
},

0 commit comments

Comments
 (0)