ember-template-compiler.js in ember-source-1.13.8

- old
+ new

@@ -3,11 +3,11 @@
  * @copyright Copyright 2011-2015 Tilde Inc. and contributors
  *            Portions Copyright 2006-2011 Strobe Inc.
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.13.7
+ * @version   1.13.8
  */
 
 (function() {
 var enifed, requireModule, eriuqer, requirejs, Ember;
 var mainContext = this;
@@ -3297,11 +3297,11 @@
     cross-platform libraries such as jQuery. For more details, see
     [Ember-Runtime](http://emberjs.com/api/modules/ember-runtime.html).
   
     @class Ember
     @static
-    @version 1.13.7
+    @version 1.13.8
     @public
   */
 
   'use strict';
 
@@ -3331,15 +3331,15 @@
   /**
     The semantic version.
   
     @property VERSION
     @type String
-    @default '1.13.7'
+    @default '1.13.8'
     @static
     @public
   */
-  Ember.VERSION = '1.13.7';
+  Ember.VERSION = '1.13.8';
 
   /**
     The hash of environment variables used to control various configuration
     settings. To specify your own or override default settings, add the
     desired properties to a global hash named `EmberENV` (or `ENV` for
@@ -10244,10 +10244,13 @@
     @param {Object} obj any object, string, number, Element, or primitive
     @return {String} the unique guid for this instance.
   */
 
   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)";
     }
@@ -10281,14 +10284,10 @@
 
       case 'boolean':
         return obj ? '(true)' : '(false)';
 
       default:
-        if (obj[GUID_KEY]) {
-          return obj[GUID_KEY];
-        }
-
         if (obj === Object) {
           return '(Object)';
         }
 
         if (obj === Array) {
@@ -12639,10 +12638,10 @@
     }
     options.plugins = plugins;
 
     options.buildMeta = function buildMeta(program) {
       return {
-        revision: 'Ember@1.13.7',
+        revision: 'Ember@1.13.8',
         loc: program.loc,
         moduleName: options.moduleName
       };
     };
 
\ No newline at end of file