Merge pull request #75 from rwjblue/use-document-service-correctly

Fix some issues with Glimmer2 usage.

Author: krisselden

.travis.yml

@@ -14,6 +14,7 @@ env:
   - EMBER_TRY_SCENARIO=1.13.13
   - EMBER_TRY_SCENARIO=2.0.3
   - EMBER_TRY_SCENARIO=2.4.5
+  - EMBER_TRY_SCENARIO=2.8
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary

addon/components/ember-wormhole.js

@@ -25,7 +25,7 @@ export default Component.extend({
     if (!id) {
       return null;
     }
-    return findElementById(this._dom.document, id);
+    return findElementById(this._dom, id);
   }),
   renderInPlace: false,
 
@@ -38,8 +38,8 @@ export default Component.extend({
     this._dom = getDOM(this);
 
     // Create text nodes used for the head, tail
-    this._wormholeHeadNode = this._dom.document.createTextNode('');
-    this._wormholeTailNode = this._dom.document.createTextNode('');
+    this._wormholeHeadNode = this._dom.createTextNode('');
+    this._wormholeTailNode = this._dom.createTextNode('');
 
     // A prop to help in the mocking of didInsertElement timing for Fastboot
     this._didInsert = false;

addon/utils/dom.js

@@ -46,14 +46,15 @@ export function findElementById(doc, id) {
 // Private Ember API usage. Get the dom implementation used by the current
 // renderer, be it native browser DOM or Fastboot SimpleDOM
 export function getDOM(context) {
-  let  container = getOwner ? getOwner(context) : context.container;
+  let container = getOwner ? getOwner(context) : context.container;
+  let documentService = container.lookup('service:-document');
+
+  if (documentService) { return documentService; }
+
   let renderer = container.lookup('renderer:-dom');
-  var domForAppWithGlimmer2 = container.lookup('service:-document');
 
-  if (renderer._dom) { // pre glimmer2
-    return renderer._dom;
-  } else if (domForAppWithGlimmer2) { // glimmer2
-    return domForAppWithGlimmer2;
+  if (renderer._dom && renderer._dom.document) { // pre Ember 2.6
+    return renderer._dom.document;
   } else {
     throw new Error('ember-wormhole could not get DOM');
   }

config/ember-try.js

@@ -22,6 +22,12 @@ module.exports = {
         'ember': '2.4.5'
       }
     },
+    {
+      name: '2.8',
+      dependencies: {
+        'ember': '~2.8.0'
+      }
+    },
     {
       name: 'ember-release',
       dependencies: {