diff options
| author | Jenny Yu <jennyyu212@outlook.com> | 2022-06-08 19:00:02 -0700 |
|---|---|---|
| committer | Jenny Yu <jennyyu212@outlook.com> | 2022-06-08 19:00:02 -0700 |
| commit | dff15ea5cc4b351f9bea90c1822e1b02d4f0730b (patch) | |
| tree | e3e893b6b8fdf95e9860673f0b4357e26dc9ff1d /src/client/goldenLayout.js | |
| parent | 88a8f35c33bbff61b0058a66d7bcc586d483deca (diff) | |
| parent | 0ae3de67900489a6ffd43eabaa810c3ec3fdddd9 (diff) | |
fix: merge conflicts
Diffstat (limited to 'src/client/goldenLayout.js')
| -rw-r--r-- | src/client/goldenLayout.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/client/goldenLayout.js b/src/client/goldenLayout.js index 82b10608d..012ee163c 100644 --- a/src/client/goldenLayout.js +++ b/src/client/goldenLayout.js @@ -458,8 +458,9 @@ if (this._bDragging === true) { this._bDragging = false; this.emit('dragStop', oEvent, this._nOriginalX + this._nX); - } else if (oEvent.target) { // make title receive pointer events to allow setting insertion position or selecting texst range - if (oEvent.target.className.includes("lm_title_wrap")) { + } else { // make title receive pointer events to allow setting insertion position or selecting texst range + const classname = typeof oEvent.target?.className === "string" ? oEvent.target.className : ""; + if (classname.includes("lm_title_wrap")) { oEvent.target.children[0].style.pointerEvents = "all"; oEvent.target.children[0].focus(); } @@ -1431,7 +1432,7 @@ this.root.callDownwards('_$init'); if (config.maximisedItemId === '__glMaximised') { - this.root.getItemsById(config.maximisedItemId)[0].toggleMaximise(); + this.root.getItemsById(config.maximisedItemId)[0]?.toggleMaximise(); } }, |