forked from josdejong/jsoneditor
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
28 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,8 +24,8 @@ | |
* Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org | ||
* | ||
* @author Jos de Jong, <[email protected]> | ||
* @version 5.9.4 | ||
* @date 2017-08-20 | ||
* @version 5.9.5 | ||
* @date 2017-08-26 | ||
*/ | ||
(function webpackUniversalModuleDefinition(root, factory) { | ||
if(typeof exports === 'object' && typeof module === 'object') | ||
|
@@ -3689,6 +3689,7 @@ return /******/ (function(modules) { // webpackBootstrap | |
function getRootNode(node){ | ||
return node.getRootNode && node.getRootNode() || window; | ||
} | ||
|
||
/** | ||
* A context menu | ||
* @param {Object[]} items Array containing the menu structure | ||
|
@@ -3920,15 +3921,17 @@ return /******/ (function(modules) { // webpackBootstrap | |
this.dom.menu.style.bottom = '0px'; | ||
} | ||
|
||
// find the root node of the page (window, or a shadow dom root element) | ||
this.rootNode = getRootNode(anchor); | ||
|
||
// attach the menu to the parent of the anchor | ||
var parent = anchor.parentNode; | ||
parent.insertBefore(this.dom.root, parent.firstChild); | ||
|
||
// create and attach event listeners | ||
var me = this; | ||
var list = this.dom.list; | ||
var rootNode = getRootNode(list); | ||
this.eventListeners.mousedown = util.addEventListener(rootNode, 'mousedown', function (event) { | ||
this.eventListeners.mousedown = util.addEventListener(this.rootNode, 'mousedown', function (event) { | ||
// hide menu on click outside of the menu | ||
var target = event.target; | ||
if ((target != list) && !me._isChildOf(target, list)) { | ||
|
@@ -3937,7 +3940,7 @@ return /******/ (function(modules) { // webpackBootstrap | |
event.preventDefault(); | ||
} | ||
}); | ||
this.eventListeners.keydown = util.addEventListener(rootNode, 'keydown', function (event) { | ||
this.eventListeners.keydown = util.addEventListener(this.rootNode, 'keydown', function (event) { | ||
me._onKeyDown(event); | ||
}); | ||
|
||
|
@@ -3968,12 +3971,11 @@ return /******/ (function(modules) { // webpackBootstrap | |
|
||
// remove all event listeners | ||
// all event listeners are supposed to be attached to document. | ||
var rootNode = getRootNode(this.dom.list); | ||
for (var name in this.eventListeners) { | ||
if (this.eventListeners.hasOwnProperty(name)) { | ||
var fn = this.eventListeners[name]; | ||
if (fn) { | ||
util.removeEventListener(rootNode, name, fn); | ||
util.removeEventListener(this.rootNode, name, fn); | ||
} | ||
delete this.eventListeners[name]; | ||
} | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,8 +24,8 @@ | |
* Copyright (c) 2011-2017 Jos de Jong, http://jsoneditoronline.org | ||
* | ||
* @author Jos de Jong, <[email protected]> | ||
* @version 5.9.4 | ||
* @date 2017-08-20 | ||
* @version 5.9.5 | ||
* @date 2017-08-26 | ||
*/ | ||
(function webpackUniversalModuleDefinition(root, factory) { | ||
if(typeof exports === 'object' && typeof module === 'object') | ||
|
@@ -11665,6 +11665,7 @@ return /******/ (function(modules) { // webpackBootstrap | |
function getRootNode(node){ | ||
return node.getRootNode && node.getRootNode() || window; | ||
} | ||
|
||
/** | ||
* A context menu | ||
* @param {Object[]} items Array containing the menu structure | ||
|
@@ -11896,15 +11897,17 @@ return /******/ (function(modules) { // webpackBootstrap | |
this.dom.menu.style.bottom = '0px'; | ||
} | ||
|
||
// find the root node of the page (window, or a shadow dom root element) | ||
this.rootNode = getRootNode(anchor); | ||
|
||
// attach the menu to the parent of the anchor | ||
var parent = anchor.parentNode; | ||
parent.insertBefore(this.dom.root, parent.firstChild); | ||
|
||
// create and attach event listeners | ||
var me = this; | ||
var list = this.dom.list; | ||
var rootNode = getRootNode(list); | ||
this.eventListeners.mousedown = util.addEventListener(rootNode, 'mousedown', function (event) { | ||
this.eventListeners.mousedown = util.addEventListener(this.rootNode, 'mousedown', function (event) { | ||
// hide menu on click outside of the menu | ||
var target = event.target; | ||
if ((target != list) && !me._isChildOf(target, list)) { | ||
|
@@ -11913,7 +11916,7 @@ return /******/ (function(modules) { // webpackBootstrap | |
event.preventDefault(); | ||
} | ||
}); | ||
this.eventListeners.keydown = util.addEventListener(rootNode, 'keydown', function (event) { | ||
this.eventListeners.keydown = util.addEventListener(this.rootNode, 'keydown', function (event) { | ||
me._onKeyDown(event); | ||
}); | ||
|
||
|
@@ -11944,12 +11947,11 @@ return /******/ (function(modules) { // webpackBootstrap | |
|
||
// remove all event listeners | ||
// all event listeners are supposed to be attached to document. | ||
var rootNode = getRootNode(this.dom.list); | ||
for (var name in this.eventListeners) { | ||
if (this.eventListeners.hasOwnProperty(name)) { | ||
var fn = this.eventListeners[name]; | ||
if (fn) { | ||
util.removeEventListener(rootNode, name, fn); | ||
util.removeEventListener(this.rootNode, name, fn); | ||
} | ||
delete this.eventListeners[name]; | ||
} | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters