Skip to content

Commit 5a78e90

Browse files
committed
Hide refresh button when rendering is not aborted and show it when rendering is aborted. Updated jQuery selectors for consistency.
1 parent 10aa5eb commit 5a78e90

File tree

5 files changed

+29
-17
lines changed

5 files changed

+29
-17
lines changed

dist/pivot.js

Lines changed: 10 additions & 6 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: 3 additions & 3 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: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -609,12 +609,14 @@ callWithJQuery ($) ->
609609

610610
if aborted and not forceRefresh
611611
# Show refresh button and display abort message
612-
@find(".pvtRefreshBtn").show()
612+
$(".pvtRefreshBtn").show()
613613
defaultMessage = "Rendering aborted by user.<br>Click refresh button to force rendering."
614614
message = abortMessage || defaultMessage
615615
abortElement = $("<div style='text-align: center; padding: 20px; color: #666;'><i class='fas fa-exclamation-triangle'></i><br>#{message}</div>")[0]
616616
return resolve(abortElement)
617617

618+
$(".pvtRefreshBtn").hide()
619+
618620
shouldVirtualize = opts.table.virtualization.enabled
619621

620622
if shouldVirtualize
@@ -729,12 +731,14 @@ callWithJQuery ($) ->
729731
callLifecycle('render-progress', 1)
730732
if aborted and not forceRefresh
731733
# Show refresh button and display abort message
732-
@find(".pvtRefreshBtn").show()
734+
$(".pvtRefreshBtn").show()
733735
defaultMessage = "Rendering aborted by user.<br>Click refresh button to force rendering."
734736
message = abortMessage || defaultMessage
735737
abortElement = $("<div style='text-align: center; padding: 20px; color: #666;'><i class='fas fa-exclamation-triangle'></i><br>#{message}</div>")[0]
736738
return resolve(abortElement)
737739

740+
$(".pvtRefreshBtn").hide()
741+
738742
# Async processing of data rows
739743
tbody = document.createElement("tbody")
740744
totalRows = rowKeys.length
@@ -930,11 +934,13 @@ callWithJQuery ($) ->
930934
callLifecycle('render-started')
931935
if aborted and not forceRefresh
932936
# Show refresh button and display abort message
933-
@find(".pvtRefreshBtn").show()
937+
$(".pvtRefreshBtn").show()
934938
defaultMessage = "Rendering aborted by user.<br>Click refresh button to force rendering."
935939
message = abortMessage || defaultMessage
936940
return $("<div style='text-align: center; padding: 20px; color: #666;'><i class='fas fa-exclamation-triangle'></i><br>#{message}</div>")[0]
937941

942+
$(".pvtRefreshBtn").hide()
943+
938944
colAttrs = pivotData.colAttrs
939945
rowAttrs = pivotData.rowAttrs
940946
rowKeys = pivotData.getRowKeys()
@@ -1741,13 +1747,13 @@ callWithJQuery ($) ->
17411747

17421748
if not shouldProceed
17431749
# Show refresh button and display message
1744-
@find(".pvtRefreshBtn").show()
1750+
$(".pvtRefreshBtn").show()
17451751
pivotTable.html("<div style='text-align: center; padding: 20px; color: #666;'><i class='fas fa-exclamation-triangle'></i><br>Calculation skipped due to complexity.<br>Click refresh button to force calculation.</div>")
17461752
pivotTable.css("opacity", 1)
17471753
return
17481754

17491755
# Hide refresh button if calculation proceeds
1750-
@find(".pvtRefreshBtn").hide()
1756+
$(".pvtRefreshBtn").hide()
17511757

17521758
if subopts.asyncMode
17531759
# Show loading indicator
@@ -2068,12 +2074,14 @@ callWithJQuery ($) ->
20682074
})
20692075
if aborted and not forceRefresh
20702076
# Show refresh button and display abort message
2071-
@find(".pvtRefreshBtn").show()
2077+
$(".pvtRefreshBtn").show()
20722078
defaultMessage = "Rendering aborted by user.<br>Click refresh button to force rendering."
20732079
message = abortMessage || defaultMessage
20742080
abortElement = $("<div style='text-align: center; padding: 20px; color: #666;'><i class='fas fa-exclamation-triangle'></i><br>#{message}</div>")[0]
20752081
return abortElement
20762082

2083+
$('.pvtRefreshBtn').hide()
2084+
20772085
shouldVirtualize = opts.table.virtualization.enabled
20782086

20792087
if not shouldVirtualize

0 commit comments

Comments
 (0)