Skip to content

Commit 6efea5c

Browse files
committed
Merge branch 'master' into production
# Conflicts: # apps/image-editor/index.d.ts
2 parents e40a764 + d53f294 commit 6efea5c

File tree

10 files changed

+46
-13
lines changed

10 files changed

+46
-13
lines changed

apps/image-editor/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Type definitions for TOAST UI Image Editor v3.14.1
1+
// Type definitions for TOAST UI Image Editor v3.14.2
22
// TypeScript Version: 3.2.2
33

44
declare namespace tuiImageEditor {

apps/image-editor/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/image-editor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tui-image-editor",
33
"author": "NHN. FE Development Lab <[email protected]>",
4-
"version": "3.14.1",
4+
"version": "3.14.2",
55
"license": "MIT",
66
"repository": {
77
"type": "git",

apps/image-editor/src/js/component/zoom.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,24 @@ class Zoom extends Component {
129129
this.graphics.on(ADD_TEXT, this._startTextEditingHandler.bind(this));
130130
this.graphics.on(TEXT_EDITING, this._startTextEditingHandler.bind(this));
131131
this.graphics.on(OBJECT_MODIFIED, this._stopTextEditingHandler.bind(this));
132+
}
133+
134+
/**
135+
* Attach zoom keyboard events
136+
*/
137+
attachKeyboardZoomEvents() {
132138
fabric.util.addListener(document, KEY_DOWN, this._listeners.keydown);
133139
fabric.util.addListener(document, KEY_UP, this._listeners.keyup);
134140
}
135141

142+
/**
143+
* Detach zoom keyboard events
144+
*/
145+
detachKeyboardZoomEvents() {
146+
fabric.util.removeListener(document, KEY_DOWN, this._listeners.keydown);
147+
fabric.util.removeListener(document, KEY_UP, this._listeners.keyup);
148+
}
149+
136150
/**
137151
* Handler when you started editing text
138152
* @private
@@ -160,7 +174,6 @@ class Zoom extends Component {
160174
}
161175

162176
if (e.keyCode === keyCodes.SPACE) {
163-
e.preventDefault();
164177
this.withSpace = true;
165178
this.startHandMode();
166179
}
@@ -173,7 +186,6 @@ class Zoom extends Component {
173186
*/
174187
_endHandModeWithSpaceBar(e) {
175188
if (e.keyCode === keyCodes.SPACE) {
176-
e.preventDefault();
177189
this.withSpace = false;
178190
this.endHandMode();
179191
}

apps/image-editor/src/js/graphics.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ class Graphics {
162162
this._createDrawingModeInstances();
163163
this._createComponents();
164164
this._attachCanvasEvents();
165+
this._attachZoomEvents();
165166
}
166167

167168
/**
@@ -173,6 +174,26 @@ class Graphics {
173174
this._canvas.clear();
174175

175176
wrapperEl.parentNode.removeChild(wrapperEl);
177+
178+
this._detachZoomEvents();
179+
}
180+
181+
/**
182+
* Attach zoom events
183+
*/
184+
_attachZoomEvents() {
185+
const zoom = this.getComponent(components.ZOOM);
186+
187+
zoom.attachKeyboardZoomEvents();
188+
}
189+
190+
/**
191+
* Detach zoom events
192+
*/
193+
_detachZoomEvents() {
194+
const zoom = this.getComponent(components.ZOOM);
195+
196+
zoom.detachKeyboardZoomEvents();
176197
}
177198

178199
/**

apps/react-image-editor/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/react-image-editor/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@toast-ui/react-image-editor",
3-
"version": "3.14.1",
3+
"version": "3.14.2",
44
"description": "TOAST UI Image-Editor for React",
55
"main": "dist/toastui-react-image-editor.js",
66
"files": [
@@ -53,6 +53,6 @@
5353
},
5454
"dependencies": {
5555
"fabric": "^4.2.0",
56-
"tui-image-editor": "^3.14.1"
56+
"tui-image-editor": "^3.14.2"
5757
}
5858
}

apps/vue-image-editor/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/vue-image-editor/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@toast-ui/vue-image-editor",
3-
"version": "3.14.1",
3+
"version": "3.14.2",
44
"description": "TOAST UI Image-Editor for Vue",
55
"main": "dist/toastui-vue-image-editor.js",
66
"files": [
@@ -43,6 +43,6 @@
4343
},
4444
"dependencies": {
4545
"fabric": "^4.2.0",
46-
"tui-image-editor": "^3.14.1"
46+
"tui-image-editor": "^3.14.2"
4747
}
4848
}

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"packages": [
33
"apps/*"
44
],
5-
"version": "3.14.1"
5+
"version": "3.14.2"
66
}

0 commit comments

Comments
 (0)