diff --git a/vasl_templates/webapp/static/css/lfa.css b/vasl_templates/webapp/static/css/lfa.css
index 6b0705e..ba05617 100644
--- a/vasl_templates/webapp/static/css/lfa.css
+++ b/vasl_templates/webapp/static/css/lfa.css
@@ -88,6 +88,8 @@
#lfa .options input[type=checkbox] { vertical-align: middle ; }
#lfa .options button.download { position: absolute ; right: 5px ; bottom: 5px ; padding: 3px !important ; }
#lfa .options button.player-colors { padding: 3px 6px 2px 5px !important ; }
+.ui-dialog.lfa input[type=checkbox][disabled] { opacity: 0.5 ; }
+.ui-dialog.lfa input[type=checkbox][disabled] + label { opacity: 0.5 ; }
/* time-plot options */
#lfa .time-plot-options button.zoom-in, #lfa .time-plot-options button.zoom-out { padding: 4px 6px 2px 6px !important ; }
diff --git a/vasl_templates/webapp/static/lfa.js b/vasl_templates/webapp/static/lfa.js
index b7a2394..0a30a8e 100644
--- a/vasl_templates/webapp/static/lfa.js
+++ b/vasl_templates/webapp/static/lfa.js
@@ -50,7 +50,7 @@ var gDistribDatasetPlayerIndex={}, gPieDatasetPlayerIndex={}, gTimePlotDatasetPl
var gDistribCharts={}, gPieCharts={}, gTimePlotChart, gHotnessChart ;
var $gDialog ;
-var $gBanner, $gHotness, $gHotnessPopup, $gSelectFilePopup, $gOptions, $gRollTypeDropList, $gDistribLineGraphsCheckBox, $gStackBarGraphsCheckBox ;
+var $gBanner, $gHotness, $gHotnessPopup, $gSelectFilePopup, $gOptions, $gRollTypeDropList, $gDistribBarGraphsCheckBox, $gStackBarGraphsCheckBox ;
var $gPlayerColorsButton, $gPlayerColorsPopup ;
var $gTimePlot, $gTimePlotChartWrapper ;
var $gTimePlotOptions, $gMovingAverageDropList, $gTimePlotZoomInButton, $gTimePlotZoomOutButton ;
@@ -204,8 +204,8 @@ function loadDialog()
$gSelectFilePopup = $( "#lfa .select-file-popup" ) ;
$gOptions = $( "#lfa .options" ) ;
$gRollTypeDropList = $( "#lfa select[name='roll-type']" ) ;
- $gDistribLineGraphsCheckBox = $( "#lfa input[name='distrib-line-graphs']" ).prop(
- "checked", gUserSettings.lfa["distrib-line-graphs"]
+ $gDistribBarGraphsCheckBox = $( "#lfa input[name='distrib-bar-graphs']" ).prop(
+ "checked", gUserSettings.lfa["distrib-bar-graphs"]
) ;
$gStackBarGraphsCheckBox = $( "#lfa input[name='stack-bar-graphs']" ).prop(
"checked", gUserSettings.lfa["stack-bar-graphs"]
@@ -274,17 +274,18 @@ function loadDialog()
gEventHandlers.addHandler( $gRollTypeDropList, "selectmenuchange", reloadAll ) ;
// add a click handler for distrib line graphs
- gEventHandlers.addHandler( $gDistribLineGraphsCheckBox, "click", function() {
+ gEventHandlers.addHandler( $gDistribBarGraphsCheckBox, "click", function() {
// update the UI
var isChecked = $(this).is( ":checked" ) ;
for ( var key in DR_VALS ) {
for ( var i=0 ; i < gDistribCharts[key].data.datasets.length-1 ; ++i )
- gDistribCharts[key].data.datasets[i].type = isChecked ? "line" : "bar" ;
- gDistribCharts[key].options.animation.duration = $gDisableAnimationsCheckBox.is( ":checked" ) ? 0 : 1000 ;
+ gDistribCharts[key].data.datasets[i].type = isChecked ? "bar" : "line" ;
+ setChartAnimation( gDistribCharts[key].options ) ;
gDistribCharts[key].update() ;
}
+ updateUi() ;
// save the new setting
- gUserSettings.lfa["distrib-line-graphs"] = isChecked ;
+ gUserSettings.lfa["distrib-bar-graphs"] = isChecked ;
save_user_settings() ;
} ) ;
@@ -294,7 +295,7 @@ function loadDialog()
var isChecked = $(this).is( ":checked" ) ;
for ( var key in DR_VALS ) {
gDistribCharts[key].options.scales.xAxes[0].stacked = isChecked ;
- gDistribCharts[key].options.animation.duration = $gDisableAnimationsCheckBox.is( ":checked" ) ? 0 : 1000 ;
+ setChartAnimation( gDistribCharts[key].options ) ;
gDistribCharts[key].update() ;
}
// save the new setting
@@ -366,6 +367,9 @@ function loadDialog()
// set initial focus
$gRollTypeDropList.focus() ;
+
+ // update the UI
+ updateUi() ;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1152,7 +1156,7 @@ function getDistribData( key )
datasets.push( {
label: label,
data: dataVals,
- type: $gDistribLineGraphsCheckBox.is(":checked") ? "line" : "bar",
+ type: $gDistribBarGraphsCheckBox.is(":checked") ? "bar" : "line",
// nb: the following are used for both bar and line graphs
borderWidth: 1,
borderColor: getPlayerColor( playerId ),
@@ -1648,6 +1652,15 @@ function updateLayout()
} ) ;
}
+function updateUi()
+{
+ // update the UI
+ if ( $gDistribBarGraphsCheckBox.is( ":checked" ) )
+ $gStackBarGraphsCheckBox.removeAttr( "disabled" ) ;
+ else
+ $gStackBarGraphsCheckBox.attr( "disabled", "disabled" ) ;
+}
+
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
var gPrevChartColors = {} ;
diff --git a/vasl_templates/webapp/templates/lfa.html b/vasl_templates/webapp/templates/lfa.html
index 7376a29..fc8f12e 100644
--- a/vasl_templates/webapp/templates/lfa.html
+++ b/vasl_templates/webapp/templates/lfa.html
@@ -51,8 +51,8 @@
- Line graphs
- Stack bar graphs
+ Bar graphs
+
No animations