Skip to content

Commit 1f8ea16

Browse files
committed
Merge pull request #301 from swisnl/issue-#295
Merge into 1.x - Issue #295
2 parents c30e47c + 8309a39 commit 1f8ea16

7 files changed

+13
-13
lines changed

dist/jquery.contextMenu.css

Lines changed: 1 addition & 1 deletion
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: 2015-10-25T14:40:09.810Z
14+
* Date: 2015-10-26T19:58:28.706Z
1515
*/
1616

1717
.context-menu-list {

dist/jquery.contextMenu.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* MIT License http://www.opensource.org/licenses/mit-license
1313
* GPL v3 http://opensource.org/licenses/GPL-3.0
1414
*
15-
* Date: 2015-10-25T14:40:10.899Z
15+
* Date: 2015-10-26T19:58:29.704Z
1616
*/
1717

1818
(function (factory) {
@@ -584,7 +584,7 @@
584584
}
585585
break;
586586
}
587-
if (typeof opt.$selected !== 'undefined') {
587+
if (typeof opt.$selected !== 'undefined' && opt.$selected !== null) {
588588
opt.$selected.trigger('mouseup');
589589
}
590590
return;
@@ -613,7 +613,7 @@
613613
// pass event to selected item,
614614
// stop propagation to avoid endless recursion
615615
e.stopPropagation();
616-
if (typeof opt.$selected !== 'undefined') {
616+
if (typeof opt.$selected !== 'undefined' && opt.$selected !== null) {
617617
opt.$selected.trigger(e);
618618
}
619619
},
@@ -770,7 +770,7 @@
770770
root = data.contextMenuRoot;
771771

772772
if (root !== opt && root.$layer && root.$layer.is(e.relatedTarget)) {
773-
if (typeof root.$selected !== 'undefined') {
773+
if (typeof root.$selected !== 'undefined' && root.$selected !== null) {
774774
root.$selected.trigger('contextmenu:blur');
775775
}
776776
e.preventDefault();

dist/jquery.contextMenu.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.contextMenu.min.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.contextMenu.min.js

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

dist/jquery.contextMenu.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/jquery.contextMenu.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@
584584
}
585585
break;
586586
}
587-
if (typeof opt.$selected !== 'undefined') {
587+
if (typeof opt.$selected !== 'undefined' && opt.$selected !== null) {
588588
opt.$selected.trigger('mouseup');
589589
}
590590
return;
@@ -613,7 +613,7 @@
613613
// pass event to selected item,
614614
// stop propagation to avoid endless recursion
615615
e.stopPropagation();
616-
if (typeof opt.$selected !== 'undefined') {
616+
if (typeof opt.$selected !== 'undefined' && opt.$selected !== null) {
617617
opt.$selected.trigger(e);
618618
}
619619
},
@@ -770,7 +770,7 @@
770770
root = data.contextMenuRoot;
771771

772772
if (root !== opt && root.$layer && root.$layer.is(e.relatedTarget)) {
773-
if (typeof root.$selected !== 'undefined') {
773+
if (typeof root.$selected !== 'undefined' && root.$selected !== null) {
774774
root.$selected.trigger('contextmenu:blur');
775775
}
776776
e.preventDefault();

0 commit comments

Comments
 (0)