Skip to content

Commit 664c96d

Browse files
committed
spectra_displayer: change scatter selection shortcut to ALT+draw
BREAKING CHANGE: Spectra displayer: the scatter selection plugin is now using ALT + draw interaction instead of just draw. Previous behavior was in conflict with the zoom plugin.
1 parent 62dea07 commit 664c96d

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"jquery-ui": "1.11.4",
4646
"jquery-tmpl": "BorisMoore/jquery-tmpl#vBeta1.0.0",
4747
"jsbarcode": "*",
48-
"jsgraph": "v1.12.4-5",
48+
"jsgraph": "v1.12.4-9",
4949
"jsNMR": "NPellet/jsNMR#73cd9c371c8ebc53c32b7f6e6c36077e8a407d99",
5050
"json-chart": "1.0.0",
5151
"jsoneditor": "3.2.0",
@@ -78,7 +78,7 @@
7878
"x2js": "1.1.7"
7979
},
8080
"resolutions": {
81-
"jsgraph": "v1.12.4-5"
81+
"jsgraph": "v1.12.4-9"
8282
},
8383
"private": true
8484
}

src/modules/types/science/spectra/spectra_displayer/controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ define(['modules/default/defaultcontroller', 'lodash'], function (Default, _) {
386386
selectScatter: {
387387
type: 'checkbox',
388388
title: 'Scatter serie',
389-
options: {yes: 'Enable scatter serie selection (draw, conflict with zoom)'}
389+
options: {yes: 'Enable scatter serie selection (ALT + draw)'}
390390
}
391391
}
392392
},

src/modules/types/science/spectra/spectra_displayer/view.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ define(['modules/default/defaultview', 'jsgraph', 'src/util/datatraversing', 'sr
132132
options.plugins.selectScatter = {};
133133
options.pluginAction.selectScatter = {
134134
shift: false,
135-
ctrl: false // TODO replace with true when fixed upstream and change in controller
135+
ctrl: false,
136+
alt: true
136137
};
137138
}
138139

0 commit comments

Comments
 (0)