Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generic assembly case added for viewer. #994

Merged
merged 1 commit into from
Aug 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions public/js/p3/widget/WorkspaceBrowser.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ define([
'./Confirmation', './SelectionToGroup', 'dijit/Dialog', 'dijit/TooltipDialog',
'dijit/popup', 'dijit/form/Select', './ContainerActionBar', './GroupExplore', './PerspectiveToolTip',
'dijit/form/TextBox', './WorkspaceObjectSelector', './PermissionEditor',
'dojo/promise/all', '../util/encodePath',
'dojo/promise/all', '../util/encodePath', './viewer/JobResult',

'dojo/NodeList-traverse'
], function (
Expand All @@ -17,7 +17,7 @@ define([
Confirmation, SelectionToGroup, Dialog, TooltipDialog,
popup, Select, ContainerActionBar, GroupExplore, PerspectiveToolTipDialog,
TextBox, WSObjectSelector, PermissionEditor,
All, encodePath
All, encodePath, JobResult
) {

var mmc = '<div class="wsActionTooltip" rel="dna">Nucleotide</div><div class="wsActionTooltip" rel="protein">Amino Acid</div>';
Expand Down Expand Up @@ -1371,10 +1371,6 @@ define([
d = 'p3/widget/viewer/GenomeComparison';
}
break;
case 'GenomeAssembly2':
case 'GenomeAssembly':
d = 'p3/widget/viewer/GenomeAssembly';
break;
case 'GenomeAnnotation':
case 'GenomeAnnotationGenbank':
d = 'p3/widget/viewer/GenomeAnnotation';
Expand All @@ -1388,7 +1384,7 @@ define([
d = 'p3/widget/viewer/ComprehensiveGenomeAnalysis';
break;
default:
console.log('A viewer could not be found for id: ' + id);
console.log('Using the default JobResult viewer. A viewer could not be found for id: ' + id);
}
}
panelCtor = window.App.getConstructor(d);
Expand All @@ -1405,7 +1401,7 @@ define([
}

Deferred.when(panelCtor, lang.hitch(this, function (Panel) {
if (!this.activePanel || !(this.activePanel instanceof Panel)) {
if ((!this.activePanel) || !(this.activePanel instanceof Panel) || this.activePanel instanceof JobResult) {
if (this.activePanel) {
this.removeChild(this.activePanel);
}
Expand Down Expand Up @@ -1468,7 +1464,7 @@ define([
this.activePanel = newPanel;
} else {
this.activePanel.set('path', this.path);
if (this.activePaneal && 'clearSelection' in this.activePaneal) {
if (this.activePanel && 'clearSelection' in this.activePanel) {
this.activePanel.clearSelection();
}
}
Expand Down
8 changes: 0 additions & 8 deletions public/js/p3/widget/viewer/GenomeAssembly.js

This file was deleted.