ember-source 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7b3c948c4a161b9e0a7f1f0f9bf038c1b840161
-  data.tar.gz: 548e7087d1d51fb4d1dcd42cf57a1db271931ab7
+  metadata.gz: b0a78a92ecf00ec8cb2837a7f1c27f45ce6eff56
+  data.tar.gz: 6b950e7989fcf4b80114d6f80e7573a6657d56d0
 SHA512:
-  metadata.gz: 43d4e42fb0f7b2bdd7162c9ef06c08c57cad56a06eb5ad2aecc87c30ec203f10246d61df34182d4b0d754eea0c1f86147268722875e17c45d816854c78f407b7
-  data.tar.gz: 64ff1f9d5e0e70f12fa3c944a7205d07328b55dd96e151ca505b5163ed6864585128dd1c6d0232d54a2d3da5763e03ec653b025e4544d518768d909639366dcc
+  metadata.gz: 950a2916ba7965a1ca27efa151f23bd520b7079cc5b8586a6f28ccfad600bf49c69ba375fb68249764e4d798a51d948e7bd1937a48ccab1628c667fa665a5bee
+  data.tar.gz: 16d25d1069e4e9c5c5d4a6c8a1a49398837a42bba19c438b99c6268028b34237e5463ae0ffa0edb87fabd176a79f2548248842cc6c538486a15a977789bc81de

data/VERSION

@@ -1 +1 @@
-1.10.0
+1.10.1

data/dist/ember-runtime.js

@@ -5,7 +5,7 @@
  *            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.10.0
+ * @version   1.10.1
  */
 
 (function() {
@@ -4852,7 +4852,7 @@ define("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.10.0
+      @version 1.10.1
     */
 
     if ('undefined' === typeof Ember) {
@@ -4879,10 +4879,10 @@ define("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.10.0'
+      @default '1.10.1'
       @static
     */
-    Ember.VERSION = '1.10.0';
+    Ember.VERSION = '1.10.1';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`

data/dist/ember-template-compiler.js

@@ -5,7 +5,7 @@
  *            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.10.0
+ * @version   1.10.1
  */
 
 (function() {
@@ -114,7 +114,7 @@ define("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.10.0
+      @version 1.10.1
     */
 
     if ('undefined' === typeof Ember) {
@@ -141,10 +141,10 @@ define("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.10.0'
+      @default '1.10.1'
       @static
     */
-    Ember.VERSION = '1.10.0';
+    Ember.VERSION = '1.10.1';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`

data/dist/ember-testing.js

@@ -5,7 +5,7 @@
  *            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.10.0
+ * @version   1.10.1
  */
 
 (function() {

data/dist/ember-tests.js

@@ -5,7 +5,7 @@
  *            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.10.0
+ * @version   1.10.1
  */
 
 (function() {
@@ -52114,8 +52114,8 @@ enifed("ember-views/tests/views/metamorph_view_test.jshint",
     });
   });
 enifed("ember-views/tests/views/select_test",
-  ["ember-views/views/select","ember-runtime/system/object","ember-metal/run_loop","ember-views/system/jquery","ember-metal/enumerable_utils","ember-views/system/event_dispatcher"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
+  ["ember-views/views/select","ember-runtime/system/object","ember-metal/run_loop","ember-views/system/jquery","ember-metal/enumerable_utils","ember-views/system/event_dispatcher","htmlbars-util/safe-string"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
     var EmberSelect = __dependency1__["default"];
     var EmberObject = __dependency2__["default"];
@@ -52123,6 +52123,7 @@ enifed("ember-views/tests/views/select_test",
     var jQuery = __dependency4__["default"];
     var map = __dependency5__.map;
     var EventDispatcher = __dependency6__["default"];
+    var SafeString = __dependency7__["default"];
 
     var trim = jQuery.trim;
 
@@ -52252,6 +52253,44 @@ enifed("ember-views/tests/views/select_test",
       deepEqual(map(select.$('option').toArray(), function(el) { return jQuery(el).attr('value'); }), ["1", "2"], "Options should have values");
     });
 
+    QUnit.test("XSS: does not escape label value when it is a SafeString", function() {
+      select.set('content', Ember.A([
+        { id: 1, firstName: new SafeString('<p>Yehuda</p>') },
+        { id: 2, firstName: new SafeString('<p>Tom</p>') }
+      ]));
+
+      select.set('optionLabelPath', 'content.firstName');
+      select.set('optionValuePath', 'content.id');
+
+      append();
+
+      equal(select.$('option').length, 2, "Should have two options");
+      equal(select.$('option[value=1] p').length, 1, "Should have child elements");
+
+      // IE 8 adds whitespace
+      equal(trim(select.$().text()), "YehudaTom", "Options should have content");
+      deepEqual(map(select.$('option').toArray(), function(el) { return jQuery(el).attr('value'); }), ["1", "2"], "Options should have values");
+    });
+
+    QUnit.test("XSS: escapes label value content", function() {
+      select.set('content', Ember.A([
+        { id: 1, firstName: '<p>Yehuda</p>' },
+        { id: 2, firstName: '<p>Tom</p>' }
+      ]));
+
+      select.set('optionLabelPath', 'content.firstName');
+      select.set('optionValuePath', 'content.id');
+
+      append();
+
+      equal(select.$('option').length, 2, "Should have two options");
+      equal(select.$('option[value=1] b').length, 0, "Should have no child elements");
+
+      // IE 8 adds whitespace
+      equal(trim(select.$().text()), "<p>Yehuda</p><p>Tom</p>", "Options should have content");
+      deepEqual(map(select.$('option').toArray(), function(el) { return jQuery(el).attr('value'); }), ["1", "2"], "Options should have values");
+    });
+
     test("can retrieve the current selected option when multiple=false", function() {
       var yehuda = { id: 1, firstName: 'Yehuda' };
       var tom = { id: 2, firstName: 'Tom' };

data/dist/ember-tests.prod.js

@@ -5,7 +5,7 @@
  *            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.10.0
+ * @version   1.10.1
  */
 
 (function() {
@@ -51981,8 +51981,8 @@ enifed("ember-views/tests/views/metamorph_view_test.jshint",
     });
   });
 enifed("ember-views/tests/views/select_test",
-  ["ember-views/views/select","ember-runtime/system/object","ember-metal/run_loop","ember-views/system/jquery","ember-metal/enumerable_utils","ember-views/system/event_dispatcher"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
+  ["ember-views/views/select","ember-runtime/system/object","ember-metal/run_loop","ember-views/system/jquery","ember-metal/enumerable_utils","ember-views/system/event_dispatcher","htmlbars-util/safe-string"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
     var EmberSelect = __dependency1__["default"];
     var EmberObject = __dependency2__["default"];
@@ -51990,6 +51990,7 @@ enifed("ember-views/tests/views/select_test",
     var jQuery = __dependency4__["default"];
     var map = __dependency5__.map;
     var EventDispatcher = __dependency6__["default"];
+    var SafeString = __dependency7__["default"];
 
     var trim = jQuery.trim;
 
@@ -52119,6 +52120,44 @@ enifed("ember-views/tests/views/select_test",
       deepEqual(map(select.$('option').toArray(), function(el) { return jQuery(el).attr('value'); }), ["1", "2"], "Options should have values");
     });
 
+    QUnit.test("XSS: does not escape label value when it is a SafeString", function() {
+      select.set('content', Ember.A([
+        { id: 1, firstName: new SafeString('<p>Yehuda</p>') },
+        { id: 2, firstName: new SafeString('<p>Tom</p>') }
+      ]));
+
+      select.set('optionLabelPath', 'content.firstName');
+      select.set('optionValuePath', 'content.id');
+
+      append();
+
+      equal(select.$('option').length, 2, "Should have two options");
+      equal(select.$('option[value=1] p').length, 1, "Should have child elements");
+
+      // IE 8 adds whitespace
+      equal(trim(select.$().text()), "YehudaTom", "Options should have content");
+      deepEqual(map(select.$('option').toArray(), function(el) { return jQuery(el).attr('value'); }), ["1", "2"], "Options should have values");
+    });
+
+    QUnit.test("XSS: escapes label value content", function() {
+      select.set('content', Ember.A([
+        { id: 1, firstName: '<p>Yehuda</p>' },
+        { id: 2, firstName: '<p>Tom</p>' }
+      ]));
+
+      select.set('optionLabelPath', 'content.firstName');
+      select.set('optionValuePath', 'content.id');
+
+      append();
+
+      equal(select.$('option').length, 2, "Should have two options");
+      equal(select.$('option[value=1] b').length, 0, "Should have no child elements");
+
+      // IE 8 adds whitespace
+      equal(trim(select.$().text()), "<p>Yehuda</p><p>Tom</p>", "Options should have content");
+      deepEqual(map(select.$('option').toArray(), function(el) { return jQuery(el).attr('value'); }), ["1", "2"], "Options should have values");
+    });
+
     test("can retrieve the current selected option when multiple=false", function() {
       var yehuda = { id: 1, firstName: 'Yehuda' };
       var tom = { id: 2, firstName: 'Tom' };

data/dist/ember.debug.js

@@ -5,7 +5,7 @@
  *            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.10.0
+ * @version   1.10.1
  */
 
 (function() {
@@ -8374,6 +8374,54 @@ enifed("ember-htmlbars/templates/component",
     }());
      __exports__["default"] = template(t);
   });
+enifed("ember-htmlbars/templates/select-option",
+  ["ember-template-compiler/system/template","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var template = __dependency1__["default"];
+    var t = (function() {
+      return {
+        isHTMLBars: true,
+        blockParams: 0,
+        cachedFragment: null,
+        hasRendered: false,
+        build: function build(dom) {
+          var el0 = dom.createDocumentFragment();
+          var el1 = dom.createTextNode("");
+          dom.appendChild(el0, el1);
+          var el1 = dom.createTextNode("");
+          dom.appendChild(el0, el1);
+          return el0;
+        },
+        render: function render(context, env, contextualElement) {
+          var dom = env.dom;
+          var hooks = env.hooks, content = hooks.content;
+          dom.detectNamespace(contextualElement);
+          var fragment;
+          if (env.useFragmentCache && dom.canClone) {
+            if (this.cachedFragment === null) {
+              fragment = this.build(dom);
+              if (this.hasRendered) {
+                this.cachedFragment = fragment;
+              } else {
+                this.hasRendered = true;
+              }
+            }
+            if (this.cachedFragment) {
+              fragment = dom.cloneNode(this.cachedFragment, true);
+            }
+          } else {
+            fragment = this.build(dom);
+          }
+          if (this.cachedFragment) { dom.repairClonedNode(fragment,[0,1]); }
+          var morph0 = dom.createMorphAt(fragment,0,1,contextualElement);
+          content(env, morph0, context, "view.label");
+          return fragment;
+        }
+      };
+    }());
+     __exports__["default"] = template(t);
+  });
 enifed("ember-htmlbars/templates/select",
   ["ember-template-compiler/system/template","exports"],
   function(__dependency1__, __exports__) {
@@ -11837,7 +11885,7 @@ enifed("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.10.0
+      @version 1.10.1
     */
 
     if ('undefined' === typeof Ember) {
@@ -11864,10 +11912,10 @@ enifed("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.10.0'
+      @default '1.10.1'
       @static
     */
-    Ember.VERSION = '1.10.0';
+    Ember.VERSION = '1.10.1';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -42240,7 +42288,7 @@ enifed("ember-views/views/metamorph_view",
     __exports__._SimpleMetamorphView = _SimpleMetamorphView;
   });
 enifed("ember-views/views/select",
-  ["ember-metal/enumerable_utils","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/collection_view","ember-metal/utils","ember-metal/is_none","ember-metal/computed","ember-runtime/system/native_array","ember-metal/mixin","ember-metal/properties","ember-metal/run_loop","ember-htmlbars/templates/select","exports"],
+  ["ember-metal/enumerable_utils","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/collection_view","ember-metal/utils","ember-metal/is_none","ember-metal/computed","ember-runtime/system/native_array","ember-metal/mixin","ember-metal/properties","ember-htmlbars/templates/select","ember-htmlbars/templates/select-option","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
     /**
@@ -42263,25 +42311,12 @@ enifed("ember-views/views/select",
     var emberA = __dependency9__.A;
     var observer = __dependency10__.observer;
     var defineProperty = __dependency11__.defineProperty;
-    var run = __dependency12__["default"];
 
-    var htmlbarsTemplate = __dependency13__["default"];
+    var htmlbarsTemplate = __dependency12__["default"];
+    var selectOptionDefaultTemplate = __dependency13__["default"];
 
     var defaultTemplate = htmlbarsTemplate;
 
-    var selectOptionDefaultTemplate = {
-      isHTMLBars: true,
-      render: function(context, env, contextualElement) {
-        var lazyValue = context.getStream('view.label');
-
-        lazyValue.subscribe(context._wrapAsScheduled(function() {
-          run.scheduleOnce('render', context, 'rerender');
-        }));
-
-        return lazyValue.value();
-      }
-    };
-
     var SelectOption = View.extend({
       instrumentDisplay: 'Ember.SelectOption',
 
@@ -47910,7 +47945,7 @@ enifed("route-recognizer",
 
     RouteRecognizer.prototype.map = map;
 
-    RouteRecognizer.VERSION = '1.10.0';
+    RouteRecognizer.VERSION = '1.10.1';
 
     __exports__["default"] = RouteRecognizer;
   });

data/dist/ember.js

@@ -5,7 +5,7 @@
  *            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.10.0
+ * @version   1.10.1
  */
 
 (function() {
@@ -8374,6 +8374,54 @@ enifed("ember-htmlbars/templates/component",
     }());
      __exports__["default"] = template(t);
   });
+enifed("ember-htmlbars/templates/select-option",
+  ["ember-template-compiler/system/template","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var template = __dependency1__["default"];
+    var t = (function() {
+      return {
+        isHTMLBars: true,
+        blockParams: 0,
+        cachedFragment: null,
+        hasRendered: false,
+        build: function build(dom) {
+          var el0 = dom.createDocumentFragment();
+          var el1 = dom.createTextNode("");
+          dom.appendChild(el0, el1);
+          var el1 = dom.createTextNode("");
+          dom.appendChild(el0, el1);
+          return el0;
+        },
+        render: function render(context, env, contextualElement) {
+          var dom = env.dom;
+          var hooks = env.hooks, content = hooks.content;
+          dom.detectNamespace(contextualElement);
+          var fragment;
+          if (env.useFragmentCache && dom.canClone) {
+            if (this.cachedFragment === null) {
+              fragment = this.build(dom);
+              if (this.hasRendered) {
+                this.cachedFragment = fragment;
+              } else {
+                this.hasRendered = true;
+              }
+            }
+            if (this.cachedFragment) {
+              fragment = dom.cloneNode(this.cachedFragment, true);
+            }
+          } else {
+            fragment = this.build(dom);
+          }
+          if (this.cachedFragment) { dom.repairClonedNode(fragment,[0,1]); }
+          var morph0 = dom.createMorphAt(fragment,0,1,contextualElement);
+          content(env, morph0, context, "view.label");
+          return fragment;
+        }
+      };
+    }());
+     __exports__["default"] = template(t);
+  });
 enifed("ember-htmlbars/templates/select",
   ["ember-template-compiler/system/template","exports"],
   function(__dependency1__, __exports__) {
@@ -11837,7 +11885,7 @@ enifed("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.10.0
+      @version 1.10.1
     */
 
     if ('undefined' === typeof Ember) {
@@ -11864,10 +11912,10 @@ enifed("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.10.0'
+      @default '1.10.1'
       @static
     */
-    Ember.VERSION = '1.10.0';
+    Ember.VERSION = '1.10.1';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -42240,7 +42288,7 @@ enifed("ember-views/views/metamorph_view",
     __exports__._SimpleMetamorphView = _SimpleMetamorphView;
   });
 enifed("ember-views/views/select",
-  ["ember-metal/enumerable_utils","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/collection_view","ember-metal/utils","ember-metal/is_none","ember-metal/computed","ember-runtime/system/native_array","ember-metal/mixin","ember-metal/properties","ember-metal/run_loop","ember-htmlbars/templates/select","exports"],
+  ["ember-metal/enumerable_utils","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/collection_view","ember-metal/utils","ember-metal/is_none","ember-metal/computed","ember-runtime/system/native_array","ember-metal/mixin","ember-metal/properties","ember-htmlbars/templates/select","ember-htmlbars/templates/select-option","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
     /**
@@ -42263,25 +42311,12 @@ enifed("ember-views/views/select",
     var emberA = __dependency9__.A;
     var observer = __dependency10__.observer;
     var defineProperty = __dependency11__.defineProperty;
-    var run = __dependency12__["default"];
 
-    var htmlbarsTemplate = __dependency13__["default"];
+    var htmlbarsTemplate = __dependency12__["default"];
+    var selectOptionDefaultTemplate = __dependency13__["default"];
 
     var defaultTemplate = htmlbarsTemplate;
 
-    var selectOptionDefaultTemplate = {
-      isHTMLBars: true,
-      render: function(context, env, contextualElement) {
-        var lazyValue = context.getStream('view.label');
-
-        lazyValue.subscribe(context._wrapAsScheduled(function() {
-          run.scheduleOnce('render', context, 'rerender');
-        }));
-
-        return lazyValue.value();
-      }
-    };
-
     var SelectOption = View.extend({
       instrumentDisplay: 'Ember.SelectOption',
 
@@ -47910,7 +47945,7 @@ enifed("route-recognizer",
 
     RouteRecognizer.prototype.map = map;
 
-    RouteRecognizer.VERSION = '1.10.0';
+    RouteRecognizer.VERSION = '1.10.1';
 
     __exports__["default"] = RouteRecognizer;
   });