X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5141c3ee23e89696773e227a93236ef2a51543c2..0fab8a581c4a711408150ed64ce909d9afda7829:/apps/workbench/app/assets/javascripts/tab_panes.js diff --git a/apps/workbench/app/assets/javascripts/tab_panes.js b/apps/workbench/app/assets/javascripts/tab_panes.js index 07e46fe65f..b19a277ef7 100644 --- a/apps/workbench/app/assets/javascripts/tab_panes.js +++ b/apps/workbench/app/assets/javascripts/tab_panes.js @@ -1,3 +1,7 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + // Load tab panes on demand. See app/views/application/_content.html.erb // Fire when a tab is selected/clicked. @@ -106,8 +110,8 @@ $(document).on('arv:pane:reload', '[data-pane-content-url]', function(e) { var content_url = $pane.attr('data-pane-content-url'); $.ajax(content_url, {dataType: 'html', type: 'GET', context: $pane}). done(function(data, status, jqxhr) { - // Preserve collapsed state var $pane = this; + // Preserve collapsed state var collapsable = {}; $(".collapse", this).each(function(i, c) { collapsable[c.id] = $(c).hasClass('in'); @@ -124,7 +128,7 @@ $(document).on('arv:pane:reload', '[data-pane-content-url]', function(e) { $pane.removeClass('pane-loading'); $pane.addClass('pane-loaded'); $pane.attr('data-loaded-at', (new Date()).getTime()); - $pane.trigger('arv:pane:loaded'); + $pane.trigger('arv:pane:loaded', [$pane]); if ($pane.hasClass('pane-stale')) { $pane.trigger('arv:pane:reload'); @@ -133,7 +137,23 @@ $(document).on('arv:pane:reload', '[data-pane-content-url]', function(e) { var $pane = this; var errhtml; var contentType = jqxhr.getResponseHeader('Content-Type'); - if (contentType && contentType.match(/\btext\/html\b/)) { + if (jqxhr.readyState == 0 || jqxhr.status == 0) { + if ($pane.attr('data-loaded-at') > 0) { + // Stale content is already present. Leave it + // there while loading the next page. + $pane.removeClass('pane-loading'); + $pane.addClass('pane-loaded'); + // ...but schedule another refresh (after a + // throttle delay) in case the act of navigating + // away gets cancelled itself, leaving this page + // with content that we know is stale. + $pane.addClass('pane-stale'); + $pane.attr('data-loaded-at', (new Date()).getTime()); + $pane.trigger('arv:pane:reload'); + return; + } + errhtml = "Cancelled."; + } else if (contentType && contentType.match(/\btext\/html\b/)) { var $response = $(jqxhr.responseText); var $wrapper = $('div#page-wrapper', $response); if ($wrapper.length) { @@ -148,7 +168,7 @@ $(document).on('arv:pane:reload', '[data-pane-content-url]', function(e) { replace(//g, '>'); } - $pane.html('

' + + $pane.html('

' + '' + ' ' + 'Reload tab

');