Skip to content

Commit 18f3246

Browse files
authored
Merge branch 'master' into task_save_open_download
2 parents d1b7eea + 255b1ab commit 18f3246

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

examples/main.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class SketchFieldDemo extends React.Component {
138138
shadowWidth: 0,
139139
shadowOffset: 0,
140140
tool: Tools.Select,
141-
enableRemoveSelected: true,
141+
enableRemoveSelected: false,
142142
fillWithColor: false,
143143
fillWithBackgroundColor: false,
144144
drawings: [],

src/SketchField.jsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -571,8 +571,9 @@ class SketchField extends PureComponent {
571571
selectedTool.configureCanvas(this.props);
572572
this._selectedTool = selectedTool;
573573
window.addEventListener('resize', this._resize, false);
574-
window.addEventListener("keydown", this.deleteKey, false);
575-
574+
window.addEventListener('keydown', this.deleteKey, false)
575+
576+
// Initialize History, with maximum number of undo steps
576577
this._history = new History(undoSteps);
577578

578579
// Events binding
@@ -593,9 +594,10 @@ class SketchField extends PureComponent {
593594
(value || defaultValue) && this.fromJSON(value || defaultValue);
594595
};
595596

596-
componentWillUnmount = () => {
597-
window.removeEventListener('resize', this._resize);
598-
window.addEventListener("keydown", this.deleteKey, false);
597+
598+
componentWillUnmount = () => {
599+
window.removeEventListener('resize', this._resize);
600+
window.removeEventListener('keydown', this.deleteKey, false)
599601
}
600602

601603
componentDidUpdate = (prevProps, prevState) => {

0 commit comments

Comments
 (0)