1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/9098e1c05065/
Changeset: 9098e1c05065
User: jeremy goecks
Date: 2014-03-09 18:13:38
Summary: JS Config: iterate through param options using underscore.
Affected #: 1 file
diff -r f5700f9988e64b84254e72b619fa4d2dc1b4e444 -r 9098e1c050652c0828cb5bf79f835c2ca0e943d8 static/scripts/utils/config.js
--- a/static/scripts/utils/config.js
+++ b/static/scripts/utils/config.js
@@ -175,9 +175,9 @@
// Draw parameter as select area
else if ( type === 'select' ) {
var select = $('<select />').attr("id", id);
- for ( var i = 0; i < param.options.length; i++ ) {
- $("<option/>").text( param.options[i].label ).attr( "value", param.options[i].value ).appendTo( select );
- }
+ _.each(param.get('options'), function(option) {
+ $("<option/>").text( option.label ).attr( "value", option.value ).appendTo( select );
+ });
select.val( value );
row.append( select );
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/f5700f9988e6/
Changeset: f5700f9988e6
User: jeremy goecks
Date: 2014-03-09 18:01:48
Summary: Fix color config initialization to use default value rather than random value.
Affected #: 1 file
diff -r 765236afce9551bb8938d236e12ed5d90cbe2c54 -r f5700f9988e64b84254e72b619fa4d2dc1b4e444 static/scripts/utils/config.js
--- a/static/scripts/utils/config.js
+++ b/static/scripts/utils/config.js
@@ -17,13 +17,14 @@
}
if (!this.get('value')) {
- if (this.get('type') === 'color') {
+ // Use default to set value.
+ this.set_value(this.get('default_value'));
+
+ // If no default value for color config, set random color.
+ if (!this.get('value') && this.get('type') === 'color') {
// For color setting, set random color.
this.set('value', util_mod.get_random_color());
}
- else {
- this.set_value(this.get('default_value'));
- }
}
},
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/341a68a70848/
Changeset: 341a68a70848
User: guerler
Date: 2014-03-09 08:18:32
Summary: Charts: Fix stacked area chart
Affected #: 1 file
diff -r ecf395a6f4f79efab99c3645d1f6950d721acf48 -r 341a68a7084879a631343b66db4f89883ce48702 config/plugins/visualizations/charts/static/plugins/nv.d3.js
--- a/config/plugins/visualizations/charts/static/plugins/nv.d3.js
+++ b/config/plugins/visualizations/charts/static/plugins/nv.d3.js
@@ -2902,12 +2902,7 @@
indexLine
.data([index]);
- //When dragging the index line, turn off line transitions.
- // Then turn them back on when done dragging.
- var oldDuration = chart.transitionDuration();
- chart.transitionDuration(0);
chart.update();
- chart.transitionDuration(oldDuration);
}
g.select('.nv-background rect')
@@ -6546,11 +6541,7 @@
brush
.x(x2)
.on('brush', function() {
- //When brushing, turn off transitions because chart needs to change immediately.
- var oldTransition = chart.transitionDuration();
- chart.transitionDuration(0);
onBrush();
- chart.transitionDuration(oldTransition);
});
if (brushExtent) brush.extent(brushExtent);
@@ -13995,7 +13986,6 @@
? d3.format('%') : yAxisTickFormat);
g.select('.nv-y.nv-axis')
- .duration(0)
.call(yAxis);
}
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/ecf395a6f4f7/
Changeset: ecf395a6f4f7
User: guerler
Date: 2014-03-09 07:50:40
Summary: Charts: Fix line with focus chart
Affected #: 1 file
diff -r 77e16bf8a25fc27610362a9577155f76da3cf1a5 -r ecf395a6f4f79efab99c3645d1f6950d721acf48 config/plugins/visualizations/charts/static/plugins/nv.d3.js
--- a/config/plugins/visualizations/charts/static/plugins/nv.d3.js
+++ b/config/plugins/visualizations/charts/static/plugins/nv.d3.js
@@ -10374,8 +10374,7 @@
//.attr('d', arc);
slices.select('path')
- .attr('d', arc)
- .attrTween('d', arcTween);
+ .attr('d', arc);
if (showLabels) {
// This does the normal label
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.