Merge pull request #12061 from stefanpenner/faster-guid-for-yo

[BUGFIX release] improve performance of guidFor when reading an exist…
emberjs · Aug 12, 2015 · 9bffc1a · 9bffc1a
2 parents 5a023f3 + a19e1f9
commit 9bffc1a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/ember-metal/lib/utils.js b/packages/ember-metal/lib/utils.js
@@ -201,6 +201,10 @@ export function generateGuid(obj, prefix) {
   @return {String} the unique guid for this instance.
 */
 export function guidFor(obj) {
+  if (obj && obj[GUID_KEY]) {
+    return obj[GUID_KEY];
+  }
+
   // special cases where we don't want to add a key to object
   if (obj === undefined) {
     return '(undefined)';
@@ -237,10 +241,6 @@ export function guidFor(obj) {
       return obj ? '(true)' : '(false)';
 
     default:
-      if (obj[GUID_KEY]) {
-        return obj[GUID_KEY];
-      }
-
       if (obj === Object) {
         return '(Object)';
       }