Merge pull request #1743 from kbase/develop

Merge latest AMA-viewer change for 4.2.1 release
kbase · Jul 2, 2020 · 86e9842 · 86e9842
2 parents 5388dcb + 38abc06
commit 86e9842
Showing 1 changed file with 0 additions and 21 deletions.
diff --git a/kbase-extension/static/kbase/js/widgets/function_output/kbaseAnnotatedMetagenomeAssembly.js b/kbase-extension/static/kbase/js/widgets/function_output/kbaseAnnotatedMetagenomeAssembly.js
@@ -237,12 +237,6 @@ define ([
                 $panel.empty();
                 $loadingDiv = $('<div>').attr('align', 'left').append($('<i class="fa fa-spinner fa-spin fa-2x">'));
                 $panel.append($loadingDiv);
-                window.setTimeout(function () {
-                    $loadingDiv.append('&nbsp; Building cache...');
-                    window.setTimeout(function () {
-                        $loadingDiv.append(' almost there...');
-                    }, 25000);
-                }, 2500);
             };
 
             var search = function (query, start, limit, sort_by) {
@@ -448,7 +442,6 @@ define ([
                         sort_by[DIR] = DESC;
                         $sortIcon.addClass('fa fa-sort-desc');
                     }
-
                     setToLoad($loadingDiv);
                     inFlight = true;
                     start = 0;
@@ -626,12 +619,6 @@ define ([
                 $panel.empty();
                 $loadingDiv = $('<div>').attr('align', 'left').append($('<i class="fa fa-spinner fa-spin fa-2x">'));
                 $panel.append($loadingDiv);
-                window.setTimeout(function () {
-                    $loadingDiv.append('&nbsp; Building cache...');
-                    window.setTimeout(function () {
-                        $loadingDiv.append(' almost there...');
-                    }, 25000);
-                }, 2500);
             };
 
             function search_contigs(start, limit, sort_by) {
@@ -762,7 +749,6 @@ define ([
                         sort_by[DIR] = DESC;
                         $sortIcon.addClass('fa fa-sort-desc');
                     }
-
                     setToLoad($loadingDiv);
                     inFlight = true;
                     start = 0;
@@ -1091,16 +1077,12 @@ define ([
 
                 get_feature_type_counts(metagenome_ref).then(
                     function (result) {
-                        console.log('heres the result', result)
                         feature_type_counts = result['feature_type_counts'];
 
                         for (const property in feature_type_counts){
                             feature_type_labels.push("Number of ".concat(property).concat("s"));
                             feature_type_vals.push(feature_type_counts[property]);
                         }
-                        console.log("in the then type labels", feature_type_labels);
-                        console.log("in the then type vals", feature_type_vals)
-
 
                         container.empty();
                         var $tabPane = $('<div id="' + pref + 'tab-content">');
@@ -1147,9 +1129,6 @@ define ([
                             feat_type_labels.push("Number of ".concat(feat_str).concat("s"))
                         }
 
-                        console.log('feature type labels', feature_type_counts);
-                        console.log('feat type labels', feat_type_labels);
-
                         var overviewLabels = [
                             'KBase Object Name',
                             'Source',