ember.js in ember-source-1.0.1

- old
+ new

@@ -1,7 +1,7 @@
-// Version: v1.0.0
-// Last commit: e2ea0cf (2013-08-31 23:47:39 -0700)
+// Version: v1.0.1
+// Last commit: 697d46e (2014-01-13 21:44:17 -0500)
 
 
 (function() {
 /*global __fail__*/
 
@@ -168,12 +168,12 @@
   }
 }
 
 })();
 
-// Version: v1.0.0
-// Last commit: e2ea0cf (2013-08-31 23:47:39 -0700)
+// Version: v1.0.1
+// Last commit: 697d46e (2014-01-13 21:44:17 -0500)
 
 
 (function() {
 var define, requireModule;
 
@@ -235,11 +235,11 @@
   The core Runtime framework is based on the jQuery API with a number of
   performance optimizations.
 
   @class Ember
   @static
-  @version 1.0.0
+  @version 1.0.1
 */
 
 if ('undefined' === typeof Ember) {
   // Create core object. Make it act like an instance of Ember.Namespace so that
   // objects assigned to it are given a sane string representation.
@@ -262,14 +262,14 @@
 
 
 /**
   @property VERSION
   @type String
-  @default '1.0.0'
+  @default '1.0.1'
   @final
 */
-Ember.VERSION = '1.0.0';
+Ember.VERSION = '1.0.1';
 
 /**
   Standard environmental variables. You can define these in a global `ENV`
   variable before loading Ember to control various configuration
   settings.
@@ -24819,10 +24819,24 @@
 
 function exists(value) {
   return !Ember.isNone(value);
 }
 
+function sanitizedHandlebarsGet(currentContext, property, options) {
+  var result = handlebarsGet(currentContext, property, options);
+  if (result === null || result === undefined) {
+    result = "";
+  } else if (!(result instanceof Handlebars.SafeString)) {
+    result = String(result);
+  }
+  if (!options.hash.unescaped){
+    result = Handlebars.Utils.escapeExpression(result);
+  }
+
+  return result;
+}
+
 // Binds a property into the DOM. This will create a hook in DOM that the
 // KVO system will look for and update if the property changes.
 function bind(property, options, preserveContext, shouldDisplay, valueNormalizer, childProperties) {
   var data = options.data,
       fn = options.fn,
@@ -24908,13 +24922,13 @@
     if (data.insideGroup) {
       observer = function() {
         Ember.run.once(view, 'rerender');
       };
 
-      var result = handlebarsGet(currentContext, property, options);
-      if (result === null || result === undefined) { result = ""; }
-      data.buffer.push(result);
+      output = sanitizedHandlebarsGet(currentContext, property, options);
+
+      data.buffer.push(output);
     } else {
       var bindView = new Ember._SimpleHandlebarsView(
         property, currentContext, !options.hash.unescaped, options.data
       );
 
@@ -24934,10 +24948,12 @@
       view.registerObserver(normalized.root, normalized.path, observer);
     }
   } else {
     // The object is not observable, so just render it out and
     // be done with it.
-    data.buffer.push(handlebarsGet(currentContext, property, options));
+    output = sanitizedHandlebarsGet(currentContext, property, options);
+
+    data.buffer.push(output);
   }
 }
 
 /**
   @private