opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 12:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

History panel: fix href/click fn collision in visualizations button

Browse Source
This commit is contained in:
Carl Eberhard
2013-12-10 11:21:16 -05:00
parent 20e478f210
commit f47d747d2a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/scripts/mvc/dataset/hda-edit.js
+8 -7
View File
@@ -184,7 +184,6 @@ var HDAEditView = hdaBase.HDABaseView.extend( LoggableMixin ).extend(
var $icon = faIconButton({
title : _l( 'Visualize' ),
href : this.urls.visualization,
faIcon : 'fa-bar-chart-o'
});
@@ -199,9 +198,8 @@ var HDAEditView = hdaBase.HDABaseView.extend( LoggableMixin ).extend(
case 'scatterplot':
return create_scatterplot_action_fn( visualization_url, params, hdaView.linkTarget );
default:
return function(){// add widget
Galaxy.frame.add(
{
return function(){
Galaxy.frame.add({
title : "Visualization",
type : "url",
content : visualization_url + '/' + visualization + '?' + $.param( params )
@@ -210,16 +208,19 @@ var HDAEditView = hdaBase.HDABaseView.extend( LoggableMixin ).extend(
}
}
function titleCase( string ){
return string.charAt( 0 ).toUpperCase() + string.slice( 1 );
}
// No need for popup menu because there's a single visualization.
if( visualizations.length === 1 ){
$icon.attr( 'data-original-title', visualizations[0] );
$icon.attr( 'data-original-title', _l( 'Visualize in ' ) + _l( titleCase( visualizations[0] ) ) );
$icon.click( create_viz_action( visualizations[0] ) );
// >1: Populate menu dict with visualization fns, make the popupmenu
} else {
_.each( visualizations, function( visualization ) {
var titleCaseVisualization = visualization.charAt( 0 ).toUpperCase() + visualization.slice( 1 );
popup_menu_dict[ _l( titleCaseVisualization ) ] = create_viz_action( visualization );
popup_menu_dict[ _l( titleCase( visualization ) ) ] = create_viz_action( visualization );
});
make_popupmenu( $icon, popup_menu_dict );
}