Skip to content

Commit 29c7a82

Browse files
committed
Refactor pivot table rendering options to use rendererOptions
- Updated the handling of forceRefresh and UI element options to be nested under rendererOptions. - Ensured that the refresh button is only managed if rendererOptions are provided. - Adjusted multiple instances in the pivot table rendering logic to reflect the new structure for better organization and clarity.
1 parent dfde8a7 commit 29c7a82

File tree

5 files changed

+41
-38
lines changed

5 files changed

+41
-38
lines changed

dist/pivot.js

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

dist/pivot.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.

dist/pivot.min.js

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

dist/pivot.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/pivot.coffee

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -558,11 +558,11 @@ callWithJQuery ($) ->
558558
pivotTableRendererAsync = (pivotData, opts) ->
559559
startTime = Date.now()
560560
aborted = false
561-
forceRefresh = opts.forceRefresh || false
561+
forceRefresh = (opts.rendererOptions and opts.rendererOptions.forceRefresh) || false
562562

563563
# Ensure refresh button exists if we have a UI context
564-
if opts.pivotUIElement
565-
ensureRefreshButton($(opts.pivotUIElement), opts.refreshFn)
564+
if opts.rendererOptions and opts.rendererOptions.pivotUIElement
565+
ensureRefreshButton($(opts.rendererOptions.pivotUIElement), opts.rendererOptions.refreshFn)
566566

567567
return new Promise (resolve, reject) ->
568568
try
@@ -656,8 +656,8 @@ callWithJQuery ($) ->
656656
domElements: result.querySelectorAll('*').length
657657
})
658658
# Hide refresh button on successful render
659-
if opts.pivotUIElement
660-
hideRefreshButton($(opts.pivotUIElement))
659+
if opts.rendererOptions and opts.rendererOptions.pivotUIElement
660+
hideRefreshButton($(opts.rendererOptions.pivotUIElement))
661661
resolve(result)
662662
return
663663

@@ -902,8 +902,8 @@ callWithJQuery ($) ->
902902
domElements: result.querySelectorAll('*').length
903903
})
904904
# Hide refresh button on successful render
905-
if opts.pivotUIElement
906-
hideRefreshButton($(opts.pivotUIElement))
905+
if opts.rendererOptions and opts.rendererOptions.pivotUIElement
906+
hideRefreshButton($(opts.rendererOptions.pivotUIElement))
907907
resolve(result)
908908

909909
# Начинаем обработку строк
@@ -933,12 +933,12 @@ callWithJQuery ($) ->
933933
opts = $.extend(true, {}, defaults, opts)
934934

935935
# Ensure refresh button exists if we have a UI context
936-
if opts.pivotUIElement
937-
ensureRefreshButton($(opts.pivotUIElement), opts.refreshFn)
936+
if opts.rendererOptions and opts.rendererOptions.pivotUIElement
937+
ensureRefreshButton($(opts.rendererOptions.pivotUIElement), opts.rendererOptions.refreshFn)
938938

939939
aborted = false
940940
startTime = Date.now()
941-
forceRefresh = opts.forceRefresh || false
941+
forceRefresh = (opts.rendererOptions and opts.rendererOptions.forceRefresh) || false
942942

943943
callLifecycle = (stage, progress = 0, metadata = null) ->
944944
return unless opts.lifecycleCallback?
@@ -1134,8 +1134,8 @@ callWithJQuery ($) ->
11341134
})
11351135

11361136
# Hide refresh button on successful render
1137-
if opts.pivotUIElement
1138-
hideRefreshButton($(opts.pivotUIElement))
1137+
if opts.rendererOptions and opts.rendererOptions.pivotUIElement
1138+
hideRefreshButton($(opts.rendererOptions.pivotUIElement))
11391139

11401140
return result
11411141

@@ -1234,7 +1234,8 @@ callWithJQuery ($) ->
12341234
x.removeChild(x.lastChild) while x.hasChildNodes()
12351235
x.appendChild(result)
12361236
# Hide refresh button on successful render
1237-
hideRefreshButton($(x))
1237+
if opts.rendererOptions and opts.rendererOptions.pivotUIElement
1238+
hideRefreshButton($(opts.rendererOptions.pivotUIElement))
12381239
resolve(result)
12391240
.catch (error) =>
12401241
reject(error)
@@ -2002,7 +2003,7 @@ callWithJQuery ($) ->
20022003
###
20032004

20042005
pivotTableRendererVirtualized = (pivotData, opts) ->
2005-
forceRefresh = opts.forceRefresh || false
2006+
forceRefresh = (opts.rendererOptions and opts.rendererOptions.forceRefresh) || false
20062007
aborted = false
20072008
defaults =
20082009
table:
@@ -2021,8 +2022,8 @@ callWithJQuery ($) ->
20212022
opts = $.extend(true, {}, defaults, opts)
20222023

20232024
# Ensure refresh button exists if we have a UI context
2024-
if opts.pivotUIElement
2025-
ensureRefreshButton($(opts.pivotUIElement), opts.refreshFn)
2025+
if opts.rendererOptions and opts.rendererOptions.pivotUIElement
2026+
ensureRefreshButton($(opts.rendererOptions.pivotUIElement), opts.rendererOptions.refreshFn)
20262027

20272028
# Автоопределение высоты контейнера
20282029
if opts.table.virtualization.autoHeight

0 commit comments

Comments
 (0)