Skip to content

Commit a6d5dc3

Browse files
committed
fix: better DOM level 2 support detection, enable using mouse events in web worker
1 parent 6cc32f8 commit a6d5dc3

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
export default (
3-
typeof window !== 'undefined'
3+
typeof self !== 'undefined'
44
&& (
55
// https://github.com/ecomfe/zrender/issues/189#issuecomment-224919809
6-
(window.msRequestAnimationFrame && window.msRequestAnimationFrame.bind(window))
7-
|| window.requestAnimationFrame
8-
|| window.mozRequestAnimationFrame
9-
|| window.webkitRequestAnimationFrame
6+
(self.msRequestAnimationFrame && self.msRequestAnimationFrame.bind(window))
7+
|| self.requestAnimationFrame
8+
|| self.mozRequestAnimationFrame
9+
|| self.webkitRequestAnimationFrame
1010
)
1111
) || function (func) {
1212
setTimeout(func, 16);
13-
};
13+
};

src/core/event.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Eventful from '../mixin/Eventful';
66
import env from './env';
77
import {isCanvasEl, transformCoordWithViewport} from './dom';
88

9-
var isDomLevel2 = (typeof window !== 'undefined') && !!window.addEventListener;
9+
var isDomLevel2 = typeof addEventListener === 'function';
1010

1111
var MOUSE_EVENT_REG = /^(?:mouse|pointer|contextmenu|drag|drop)|click/;
1212
var _calcOut = [];

src/zrender.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ var ZRender = function (id, dom, opts) {
130130
this.storage = storage;
131131
this.painter = painter;
132132

133-
var handlerProxy = (!env.node && !env.worker) ? new HandlerProxy(painter.getViewportRoot(), painter.root) : null;
133+
var handlerProxy = !env.node ? new HandlerProxy(painter.getViewportRoot(), painter.root) : null;
134134
this.handler = new Handler(storage, painter, handlerProxy, painter.root);
135135

136136
/**
@@ -450,4 +450,3 @@ ZRender.prototype = {
450450
delInstance(this.id);
451451
}
452452
};
453-

0 commit comments

Comments
 (0)