From 95d712b8eaf4d31d5d08bbf6e4e19b0b51a4d6ae Mon Sep 17 00:00:00 2001
From: Teddy Zeenny <teddyzeenny@gmail.com>
Date: Mon, 23 Nov 2015 21:57:37 +0200
Subject: [PATCH] Use the new resolveRegistration

---
 ember_debug/data-debug.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ember_debug/data-debug.js b/ember_debug/data-debug.js
index bc53d818d7..9ecc095b1e 100644
--- a/ember_debug/data-debug.js
+++ b/ember_debug/data-debug.js
@@ -25,7 +25,11 @@ export default EmberObject.extend(PortMixin, {
   }),
 
   _resolve(name) {
-    const container = this.get('application').__container__;
+    // Ember >= 2.1
+    if (this.get('application').resolveRegistration) {
+      return this.get('application').resolveRegistration(name);
+    }
+    let container = this.get('application').__container__;
     let registry = this.get('application.registry');
     if (registry) {
       // Ember >= 1.11
@@ -33,9 +37,6 @@ export default EmberObject.extend(PortMixin, {
     } else if (container.resolve) {
       // Ember < 1.11
       return container.resolve(name);
-    } else if (container.resolveRegistration) {
-      // Ember >= 2.1
-      return container.resolveRegistration(name);
     } else {
       // Ember >= 2.0 < 2.1
       return container.registry.resolve(name);