projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
289a84c
)
3099: Use appropriate tr>td markup if infinite scroll container is a table.
author
Tom Clegg <tom@curoverse.com>
Tue, 1 Jul 2014 00:41:15 +0000
(20:41 -0400)
committer
Tom Clegg <tom@curoverse.com>
Tue, 1 Jul 2014 00:41:15 +0000
(20:41 -0400)
Remove unused class.
apps/workbench/app/assets/javascripts/infinite_scroll.js
patch
|
blob
|
history
diff --git
a/apps/workbench/app/assets/javascripts/infinite_scroll.js
b/apps/workbench/app/assets/javascripts/infinite_scroll.js
index 44584d97f48f0b4f8db5b0d075714dd80e755929..a17b446c465280127a476b108587f39bcbc10b87 100644
(file)
--- a/
apps/workbench/app/assets/javascripts/infinite_scroll.js
+++ b/
apps/workbench/app/assets/javascripts/infinite_scroll.js
@@
-3,6
+3,7
@@
function maybe_load_more_content() {
var container; // element that receives new content
var src; // url for retrieving content
var scrollHeight;
var container; // element that receives new content
var src; // url for retrieving content
var scrollHeight;
+ var spinner, colspan;
scrollHeight = scroller.scrollHeight || $('body')[0].scrollHeight;
if ($(scroller).scrollTop() + $(scroller).height()
>
scrollHeight = scroller.scrollHeight || $('body')[0].scrollHeight;
if ($(scroller).scrollTop() + $(scroller).height()
>
@@
-14,12
+15,27
@@
function maybe_load_more_content() {
return;
// Don't start another request until this one finishes
$(container).attr('data-infinite-content-href', null);
return;
// Don't start another request until this one finishes
$(container).attr('data-infinite-content-href', null);
- $(container).append('<div class="spinner spinner-32px spinner-h-center infinite-scroller-spinner"></div>');
+ spinner = '<div class="spinner spinner-32px spinner-h-center"></div>';
+ if ($(container).is('table,tbody,thead,tfoot')) {
+ // Hack to determine how many columns a new tr should have
+ // in order to reach full width.
+ colspan = $(container).closest('table').
+ find('tr').eq(0).find('td,th').length;
+ if (colspan == 0)
+ colspan = '*';
+ spinner = ('<tr class="spinner"><td colspan="' + colspan + '">' +
+ spinner +
+ '</td></tr>');
+ }
+ $(container).append(spinner);
$.ajax(src,
{dataType: 'json',
type: 'GET',
data: {},
context: {container: container, src: src}}).
$.ajax(src,
{dataType: 'json',
type: 'GET',
data: {},
context: {container: container, src: src}}).
+ always(function() {
+ $(this.container).find(".spinner").detach();
+ }).
fail(function(jqxhr, status, error) {
if (jqxhr.readyState == 0 || jqxhr.status == 0) {
message = "Cancelled."
fail(function(jqxhr, status, error) {
if (jqxhr.readyState == 0 || jqxhr.status == 0) {
message = "Cancelled."
@@
-33,7
+49,6
@@
function maybe_load_more_content() {
$(this.container).attr('data-infinite-content-href', this.src);
}).
done(function(data, status, jqxhr) {
$(this.container).attr('data-infinite-content-href', this.src);
}).
done(function(data, status, jqxhr) {
- $(this.container).find(".spinner").detach();
$(this.container).append(data.content);
$(this.container).attr('data-infinite-content-href', data.next_page_href);
});
$(this.container).append(data.content);
$(this.container).attr('data-infinite-content-href', data.next_page_href);
});
@@
-44,7
+59,7
@@
$(document).
$('[data-infinite-scroller]').each(function() {
var $scroller = $($(this).attr('data-infinite-scroller'));
if (!$scroller.hasClass('smart-scroll') &&
$('[data-infinite-scroller]').each(function() {
var $scroller = $($(this).attr('data-infinite-scroller'));
if (!$scroller.hasClass('smart-scroll') &&
- 'scroll' != $scroller.css('overflow-y'))
+
'scroll' != $scroller.css('overflow-y'))
$scroller = $(window);
$scroller.
addClass('infinite-scroller').
$scroller = $(window);
$scroller.
addClass('infinite-scroller').