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

- old
+ new

@@ -4,11 +4,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   2.2.0
+ * @version   2.2.1
  */
 
 var enifed, requireModule, require, requirejs, Ember;
 var mainContext = this;
 
@@ -4134,11 +4134,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 2.2.0
+    @version 2.2.1
     @public
   */
 
   'use strict';
 
@@ -4178,15 +4178,15 @@
   /**
     The semantic version.
   
     @property VERSION
     @type String
-    @default '2.2.0'
+    @default '2.2.1'
     @static
     @public
   */
-  Ember.VERSION = '2.2.0';
+  Ember.VERSION = '2.2.1';
 
   /**
     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
@@ -12513,11 +12513,11 @@
     options.plugins = plugins;
 
     options.buildMeta = function buildMeta(program) {
       return {
         fragmentReason: fragmentReason(program),
-        revision: 'Ember@2.2.0',
+        revision: 'Ember@2.2.1',
         loc: program.loc,
         moduleName: options.moduleName
       };
     };
 
@@ -19590,11 +19590,11 @@
       case 'object':
         if (typeof content.nodeType === 'number') {
           return this.setNode(content);
         }
         /* Handlebars.SafeString */
-        if (typeof content.string === 'string') {
-          return this.setHTML(content.string);
+        if (typeof content.toHTML === 'function') {
+          return this.setHTML(content.toHTML());
         }
         if (this.parseTextAsHTML) {
           return this.setHTML(content.toString());
         }
       /* falls through */
\ No newline at end of file