Skip to content

Commit 20bfe6f

Browse files
authored
Merge pull request #183 from luusluus/175-text-between-is-rendered-with-a-closing-tag-on-the-end
fix: show correct cell value in popup
2 parents 6fdd559 + 2656edd commit 20bfe6f

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

media/scripts/main.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,22 +160,22 @@
160160

161161
function onPopupOpenedQueryResultTab(component) {
162162
const parentContainerId = 'table-queryTab'
163-
onPopupOpened(parentContainerId)
163+
onPopupOpened(parentContainerId, component)
164164
}
165165

166166
function onPopupOpenedDataTab(component) {
167167
const parentContainerId = 'data-tab-panel'
168-
onPopupOpened(parentContainerId)
168+
onPopupOpened(parentContainerId, component)
169169
}
170170

171171
function onPopupOpenedSchemaTab(component) {
172172
const parentContainerId = 'schema'
173-
onPopupOpened(parentContainerId)
173+
onPopupOpened(parentContainerId, component)
174174
}
175175

176176
function onPopupOpenedMetaDataTab(component) {
177177
const parentContainerId = 'metadata'
178-
onPopupOpened(parentContainerId)
178+
onPopupOpened(parentContainerId, component)
179179
}
180180

181181
function containsHTML(str) {
@@ -192,10 +192,13 @@
192192
.replace(/'/g, ''')
193193
}
194194

195-
function onPopupOpened(parentContainerId) {
196-
const element = document.getElementsByClassName(
195+
function onPopupOpened(parentContainerId, component) {
196+
let element = document.getElementsByClassName(
197197
'tabulator-popup tabulator-popup-container'
198198
)[0]
199+
200+
const cellValue = component.getValue()
201+
199202
let innerHTML = element.innerHTML
200203
let style = element.style
201204

@@ -220,6 +223,7 @@
220223
tab: tab,
221224
})
222225
} else {
226+
innerHTML = cellValue
223227
if (containsHTML(innerHTML)) {
224228
element.innerHTML = escapeHtml(innerHTML)
225229
}

0 commit comments

Comments
 (0)