Skip to content

Commit 6868cee

Browse files
authored
Merge pull request #73 from chadhietala/fix-dom-lookup
[Glimmer2] Use the document service for glimmer
2 parents b39e421 + dbcc0b4 commit 6868cee

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

addon/utils/dom.js

+9-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* be it Fastboot's SimpleDOM or the browser's version.
44
*/
55

6+
import Ember from 'ember';
7+
let getOwner = Ember.getOwner;
8+
69
export function getActiveElement() {
710
if (typeof document === 'undefined') {
811
return null;
@@ -43,11 +46,14 @@ export function findElementById(doc, id) {
4346
// Private Ember API usage. Get the dom implementation used by the current
4447
// renderer, be it native browser DOM or Fastboot SimpleDOM
4548
export function getDOM(context) {
46-
let { renderer } = context;
49+
let container = getOwner ? getOwner(context) : context.container;
50+
let renderer = container.lookup('renderer:-dom');
51+
var domForAppWithGlimmer2 = container.lookup('service:-document');
52+
4753
if (renderer._dom) { // pre glimmer2
4854
return renderer._dom;
49-
} else if (renderer._env && renderer._env.getDOM) { // glimmer2
50-
return renderer._env.getDOM();
55+
} else if (domForAppWithGlimmer2) { // glimmer2
56+
return domForAppWithGlimmer2;
5157
} else {
5258
throw new Error('ember-wormhole could not get DOM');
5359
}

0 commit comments

Comments
 (0)