Merge branch 'master' into 4024-pipeline-instances-scroll

[arvados.git] / apps / workbench / app / assets / javascripts / infinite_scroll.js

diff --git a/apps/workbench/app/assets/javascripts/infinite_scroll.js b/apps/workbench/app/assets/javascripts/infinite_scroll.js
index f07cd0978fb380bfa4205b1e9d3aea146073d926..7bdf574ed9964802d6dab2b011ad3d8ca8b7fd1d 100644 (file)
--- a/apps/workbench/app/assets/javascripts/infinite_scroll.js
+++ b/apps/workbench/app/assets/javascripts/infinite_scroll.js
@@ -1,7 +1,7 @@
 function maybe_load_more_content(event) {
-    var scroller = this;        // element with scroll bars
-    var $container;             // element that receives new content
-    var src;                    // url for retrieving content
+    var scroller = this;
+    var $container = $(event.data.container);
+    var src;                     // url for retrieving content
     var scrollHeight;
     var spinner, colspan;
     var serial = Date.now();
@@ -11,7 +11,6 @@ function maybe_load_more_content(event) {
         >
         scrollHeight - 50)
     {
-        $container = $(event.data.container);
         if (!$container.attr('data-infinite-content-href0')) {
             // Remember the first page source url, so we can refresh
             // from page 1 later.
@@ -201,7 +200,7 @@ $(document).
                 if( hasHTML5History() && history.state !== undefined && history.state !== null && history.state.order !== undefined && history.state.order[tabId] !== undefined ) {
                     // we will use the list of one or more table columns associated with this header to find the right element
                     // see sortable_columns as it is passed to render_pane in the various tab .erbs (e.g. _show_jobs_and_pipelines.html.erb)
-                    var strippedColumns = history.state.order[tabId].replace(/\s|asc|desc/g,'');
+                    var strippedColumns = history.state.order[tabId].replace(/\s|\basc\b|\bdesc\b/g,'');
                     var sortDirection = history.state.order[tabId].split(" ")[1].replace(/,/,'');
                     $columnHeader = $(this).closest('table').find('[data-sort-order="'+ strippedColumns +'"]');
                     setColumnSort( $(this), $columnHeader, sortDirection );