Skip to content

Commit

Permalink
Merge pull request maximilianh#220 from mxposed/close-markers-on-esc
Browse files Browse the repository at this point in the history
Do not remove focus after showing markers table, fixes maximilianh#176
  • Loading branch information
maximilianh committed Jun 23, 2021
2 parents 8909195 + 4f311d6 commit d50daf1
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions src/cbPyLib/cellbrowser/cbWeb/js/cellBrowser.js
Original file line number Diff line number Diff line change
Expand Up @@ -2764,7 +2764,7 @@ var cellbrowser = function() {
}]
};

var optDict = {
var optDict = {
maintainAspectRatio: false,
legend: { display: false },
title: { display: false }
Expand All @@ -2777,13 +2777,13 @@ var cellbrowser = function() {
yLabel = db.conf.unit;

if (yLabel!==null)
optDict.scales = {
yAxes: [{
scaleLabel: {
display: true,
optDict.scales = {
yAxes: [{
scaleLabel: {
display: true,
labelString: yLabel
}
}]
}
}]
};

window.setTimeout(function() {
Expand Down Expand Up @@ -6880,8 +6880,6 @@ var cellbrowser = function() {

var ttOpt = {"html": true, "animation": false, "delay":{"show":100, "hide":100} };
$(".tpPlots").bsTooltip(ttOpt);

removeFocus();
}

var digitTest = /^\d+$/,
Expand Down

0 comments on commit d50daf1

Please sign in to comment.