Fix #829: z-index issue of context-menu button and conflicting css names
This commit is contained in:
parent
43e0c129ec
commit
009d896c30
|
@ -5,9 +5,10 @@ https://github.com/josdejong/jsoneditor
|
||||||
|
|
||||||
## not yet published, version 7.2.1
|
## not yet published, version 7.2.1
|
||||||
|
|
||||||
- Fixed #828: do not expand/collapse when clicking the text of a node in modes
|
|
||||||
`view` or `form`.
|
|
||||||
- Fixed #826: editor not allowing indentation `0`.
|
- Fixed #826: editor not allowing indentation `0`.
|
||||||
|
- Fixed #828: do not expand/collapse when clicking the text of a node
|
||||||
|
in modes `view` or `form`.
|
||||||
|
- Fixed #829: z-index issue of context-menu button and conflicting css names.
|
||||||
|
|
||||||
|
|
||||||
## 2019-10-23, version 7.2.0
|
## 2019-10-23, version 7.2.0
|
||||||
|
|
|
@ -1986,7 +1986,7 @@ export class Node {
|
||||||
const menu = document.createElement('button')
|
const menu = document.createElement('button')
|
||||||
menu.type = 'button'
|
menu.type = 'button'
|
||||||
dom.menu = menu
|
dom.menu = menu
|
||||||
menu.className = 'jsoneditor-button jsoneditor-contextmenu'
|
menu.className = 'jsoneditor-button jsoneditor-contextmenu-button'
|
||||||
menu.title = translate('actionsMenu')
|
menu.title = translate('actionsMenu')
|
||||||
tdMenu.appendChild(dom.menu)
|
tdMenu.appendChild(dom.menu)
|
||||||
dom.tr.appendChild(tdMenu)
|
dom.tr.appendChild(tdMenu)
|
||||||
|
|
|
@ -55,7 +55,7 @@ export function appendNodeFactory (Node) {
|
||||||
dom.tdMenu = tdMenu
|
dom.tdMenu = tdMenu
|
||||||
const menu = document.createElement('button')
|
const menu = document.createElement('button')
|
||||||
menu.type = 'button'
|
menu.type = 'button'
|
||||||
menu.className = 'jsoneditor-button jsoneditor-contextmenu'
|
menu.className = 'jsoneditor-button jsoneditor-contextmenu-button'
|
||||||
menu.title = 'Click to open the actions menu (Ctrl+M)'
|
menu.title = 'Click to open the actions menu (Ctrl+M)'
|
||||||
dom.menu = menu
|
dom.menu = menu
|
||||||
tdMenu.appendChild(dom.menu)
|
tdMenu.appendChild(dom.menu)
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
background: $jse-white;
|
background: $jse-white;
|
||||||
box-shadow: $jse-box-shadow;
|
box-shadow: $jse-box-shadow;
|
||||||
border: 1px solid $jse-bar-border;
|
border: 1px solid $jse-bar-border;
|
||||||
z-index: 100;
|
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
cursor: default;
|
cursor: default;
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
.jsoneditor-contextmenu {
|
.jsoneditor-contextmenu {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
box-sizing: content-box;
|
box-sizing: content-box;
|
||||||
z-index: 99;
|
z-index: 1;
|
||||||
.jsoneditor-menu {
|
.jsoneditor-menu {
|
||||||
position: relative;
|
position: relative;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
|
|
@ -156,7 +156,7 @@ div {
|
||||||
&.jsoneditor-expanded {
|
&.jsoneditor-expanded {
|
||||||
background-position: 0 -72px;
|
background-position: 0 -72px;
|
||||||
}
|
}
|
||||||
&.jsoneditor-contextmenu {
|
&.jsoneditor-contextmenu-button {
|
||||||
background-position: -48px -72px;
|
background-position: -48px -72px;
|
||||||
}
|
}
|
||||||
&.jsoneditor-invisible {
|
&.jsoneditor-invisible {
|
||||||
|
@ -312,10 +312,10 @@ div.jsoneditor-value.jsoneditor-object,
|
||||||
div.jsoneditor-value.jsoneditor-array {
|
div.jsoneditor-value.jsoneditor-array {
|
||||||
min-width: 16px;
|
min-width: 16px;
|
||||||
}
|
}
|
||||||
div.jsoneditor-tree button.jsoneditor-contextmenu:hover,
|
div.jsoneditor-tree button.jsoneditor-contextmenu-button:hover,
|
||||||
div.jsoneditor-tree button.jsoneditor-contextmenu:focus,
|
div.jsoneditor-tree button.jsoneditor-contextmenu-button:focus,
|
||||||
div.jsoneditor-tree button.jsoneditor-contextmenu.jsoneditor-selected,
|
div.jsoneditor-tree button.jsoneditor-contextmenu-button.jsoneditor-selected,
|
||||||
tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-contextmenu {
|
tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-contextmenu-button {
|
||||||
background-position: -48px -48px;
|
background-position: -48px -48px;
|
||||||
}
|
}
|
||||||
div.jsoneditor-tree div.jsoneditor-show-more a:hover,
|
div.jsoneditor-tree div.jsoneditor-show-more a:hover,
|
||||||
|
@ -345,11 +345,11 @@ tr.jsoneditor-selected {
|
||||||
background-color: $jse-empty;
|
background-color: $jse-empty;
|
||||||
}
|
}
|
||||||
tr.jsoneditor-selected button.jsoneditor-dragarea,
|
tr.jsoneditor-selected button.jsoneditor-dragarea,
|
||||||
tr.jsoneditor-selected button.jsoneditor-contextmenu {
|
tr.jsoneditor-selected button.jsoneditor-contextmenu-button {
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
}
|
}
|
||||||
tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-dragarea,
|
tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-dragarea,
|
||||||
tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-contextmenu {
|
tr.jsoneditor-selected.jsoneditor-first button.jsoneditor-contextmenu-button {
|
||||||
visibility: visible;
|
visibility: visible;
|
||||||
}
|
}
|
||||||
div.jsoneditor-tree button.jsoneditor-dragarea:hover,
|
div.jsoneditor-tree button.jsoneditor-dragarea:hover,
|
||||||
|
@ -395,7 +395,6 @@ pre.jsoneditor-preview,
|
||||||
position: absolute;
|
position: absolute;
|
||||||
cursor: auto;
|
cursor: auto;
|
||||||
width: 200px;
|
width: 200px;
|
||||||
z-index: 999;
|
|
||||||
&.jsoneditor-above {
|
&.jsoneditor-above {
|
||||||
bottom: 32px;
|
bottom: 32px;
|
||||||
left: -98px;
|
left: -98px;
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
white-space: normal;
|
white-space: normal;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
background-color: $jse-light-bg;
|
background-color: $jse-light-bg;
|
||||||
z-index: 999;
|
z-index: 1;
|
||||||
box-shadow: $jse-box-shadow;
|
box-shadow: $jse-box-shadow;
|
||||||
span {
|
span {
|
||||||
&.jsoneditor-treepath-show-all-btn {
|
&.jsoneditor-treepath-show-all-btn {
|
||||||
|
|
Loading…
Reference in New Issue