ember-source 1.11.0.1 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b800154bbefd1a5933af03f915bcd232eff65c5d
-  data.tar.gz: 817cac315a1d36451feb8c25b91a330cc9cbd378
+  metadata.gz: d2009c1cbc370ef8b1bb0673ce535ec96abc27e9
+  data.tar.gz: ad7d33f8c3a07088b63ca666257f40da13caccb2
 SHA512:
-  metadata.gz: f21bbcacc2028282b8670f8c92bb405d855cff092c253db6b3ac19b4b1d1bfdb5ef249058a76301f3e137b4b9a4ac68c9744eb4be9059cbc79da12d9857c632e
-  data.tar.gz: 35e92bc468252a1ea72ddc21c559be56232e3b4ac5eeec4c2129290c12ce54ba9c52371dce5722e556dbfa5e9352bd397a3c99475f15f396080794f459b57b7f
+  metadata.gz: 9d2786cf57e4d74b35ca7901f19b291af948d462ac0b3e63c382abd45cabe84c04ba9afad87e46e491ca680c22bf1f42510b7bb8b972183fca304c2f71d28c96
+  data.tar.gz: b81712a38b0929757a87625f2ff1a9901f818a4ab95cfed6fe42eeecf1bc9f413ba4e1538a43eb28a0615c0cdb8879a0cf81eb6678bfe7006e87fd955730c3f1

data/VERSION

@@ -1 +1 @@
-1.11.0.1
+1.11.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.11.0
+ * @version   1.11.1
  */
 
 (function() {
@@ -4949,7 +4949,7 @@ enifed('ember-metal/core', ['exports'], function (exports) {
 
     @class Ember
     @static
-    @version 1.11.0
+    @version 1.11.1
   */
 
   if ('undefined' === typeof Ember) {
@@ -4977,10 +4977,10 @@ enifed('ember-metal/core', ['exports'], function (exports) {
   /**
     @property VERSION
     @type String
-    @default '1.11.0'
+    @default '1.11.1'
     @static
   */
-  Ember.VERSION = '1.11.0';
+  Ember.VERSION = '1.11.1';
 
   /**
     Standard environmental variables. You can define these in a global `EmberENV`
@@ -10362,7 +10362,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return object && object.isStream;
   }
 
-  /**
+  /*
    A method of subscribing to a stream which is safe for use with a non-stream
    object. If a non-stream object is passed, the function does nothing.
 
@@ -10380,7 +10380,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     }
   }
 
-  /**
+  /*
    A method of unsubscribing from a stream which is safe for use with a non-stream
    object. If a non-stream object is passed, the function does nothing.
 
@@ -10397,7 +10397,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     }
   }
 
-  /**
+  /*
    Retrieve the value of a stream, or in the case a non-stream object is passed,
    return the object itself.
 
@@ -10415,7 +10415,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     }
   }
 
-  /**
+  /*
    Map an array, replacing any streams with their values.
 
    @public
@@ -10436,7 +10436,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return ret;
   }
 
-  /**
+  /*
    Map a hash, replacing any stream property values with the current value of that
    stream.
 
@@ -10457,7 +10457,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return ret;
   }
 
-  /**
+  /*
    Check whether an array contains any stream values
 
    @public
@@ -10481,7 +10481,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return containsStream;
   }
 
-  /**
+  /*
    Check whether a hash has any stream property values
 
    @public
@@ -10504,7 +10504,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     return containsStream;
   }
 
-  /**
+  /*
    Join an array, with any streams replaced by their current values
 
    @public
@@ -10537,7 +10537,7 @@ enifed('ember-metal/streams/utils', ['exports', './stream'], function (exports,
     }
   }
 
-  /**
+  /*
    Generate a new stream by providing a source stream and a function that can
    be used to transform the stream's value. In the case of a non-stream object,
    returns the result of the function.

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.11.0
+ * @version   1.11.1
  */
 
 (function() {
@@ -133,7 +133,7 @@ enifed('ember-metal/core', ['exports'], function (exports) {
 
     @class Ember
     @static
-    @version 1.11.0
+    @version 1.11.1
   */
 
   if ('undefined' === typeof Ember) {
@@ -161,10 +161,10 @@ enifed('ember-metal/core', ['exports'], function (exports) {
   /**
     @property VERSION
     @type String
-    @default '1.11.0'
+    @default '1.11.1'
     @static
   */
-  Ember.VERSION = '1.11.0';
+  Ember.VERSION = '1.11.1';
 
   /**
     Standard environmental variables. You can define these in a global `EmberENV`
@@ -595,7 +595,7 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
     var disableComponentGeneration = true;
     
     return {
-      revision: 'Ember@1.11.0',
+      revision: 'Ember@1.11.1',
 
       disableComponentGeneration: disableComponentGeneration,
 

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.11.0
+ * @version   1.11.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.11.0
+ * @version   1.11.1
  */
 
 (function() {
@@ -6890,7 +6890,28 @@ enifed('ember-htmlbars/tests/compat/helper_test', ['ember-htmlbars/compat/helper
       controller: {
         value: 'foo'
       },
-      template: compile['default']('{{#test}}foo{{/test}}')
+      template: compile['default']('{{#test}}{{value}}{{/test}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$().text(), 'foo');
+  });
+
+  QUnit.test('allows usage of the template inverse', function() {
+    expect(1);
+
+    function someHelper(options) {
+      options.inverse();
+    }
+
+    compat__helper.registerHandlebarsCompatibleHelper('test', someHelper);
+
+    view = EmberView['default'].create({
+      controller: {
+        value: 'foo'
+      },
+      template: compile['default']('{{#test}}Nothing to see here.{{else}}{{value}}{{/test}}')
     });
 
     utils.runAppend(view);
@@ -16873,7 +16894,8 @@ enifed('ember-htmlbars/tests/system/lookup-helper_test', ['ember-htmlbars/system
 
   function generateEnv(helpers) {
     return {
-      helpers: (helpers ? helpers : {})
+      helpers: (helpers ? helpers : {}),
+      data: { view: { } }
     };
   }
 
@@ -16960,7 +16982,11 @@ enifed('ember-htmlbars/tests/system/lookup-helper_test', ['ember-htmlbars/system
     var fakeOptions = {
       morph: { update: function() { } }
     };
-    var fakeEnv = {};
+    var fakeEnv = {
+      data: {
+        view: { }
+      }
+    };
     actual.helperFunction(fakeParams, fakeHash, fakeOptions, fakeEnv);
 
     ok(called, 'HTMLBars compatible wrapper is wraping the provided function');
@@ -17357,7 +17383,7 @@ enifed('ember-htmlbars/tests/system/render_view_test', ['ember-runtime/tests/uti
     view = EmberView['default'].create({
       template: {
         isHTMLBars: true,
-        revision: 'Ember@1.11.0',
+        revision: 'Ember@1.11.1',
         render: function(view, env, contextualElement, blockArguments) {
           for (var i = 0, l = keyNames.length; i < l; i++) {
             var keyName = keyNames[i];
@@ -31321,6 +31347,23 @@ enifed('ember-routing-htmlbars/tests/helpers/render_test', ['ember-metal/core',
     equal(view.$().text(), 'Hello other!');
   });
 
+  QUnit.test("{{render}} helper should not require view to provide its own template", function() {
+    var template = "{{render 'fish'}}";
+    var controller = controllers__controller["default"].extend({ container: container });
+    view = EmberView['default'].create({
+      controller: controller.create(),
+      template: compile['default'](template)
+    });
+
+    container._registry.register('template:fish', compile['default']('Hello fish!'));
+
+    container._registry.register('view:fish', EmberView['default'].extend());
+
+    tests__utils.runAppend(view);
+
+    equal(view.$().text(), 'Hello fish!');
+  });
+
 });
 enifed('ember-routing-htmlbars/tests/helpers/render_test.jscs-test', function () {
 
@@ -37097,6 +37140,19 @@ enifed('ember-runtime/tests/controllers/array_controller_test', ['ember-metal/co
     }
   });
 
+  QUnit.test('works properly when model is set to `null`', function() {
+    var controller = ArrayController['default'].create();
+
+    property_set.set(controller, 'model', null);
+    equal(property_get.get(controller, 'model'), null, "can set model to `null`");
+
+    property_set.set(controller, 'model', undefined);
+    equal(property_get.get(controller, 'model'), undefined, "can set model to `undefined`");
+
+    property_set.set(controller, 'model', false);
+    equal(property_get.get(controller, 'model'), false, "can set model to `undefined`");
+  });
+
 });
 enifed('ember-runtime/tests/controllers/array_controller_test.jscs-test', function () {
 
@@ -52661,7 +52717,7 @@ enifed('ember-template-compiler/tests/system/compile_test', ['ember-template-com
 
     var actual = compile['default'](templateString);
 
-    equal(actual.revision, 'Ember@1.11.0', 'revision is included in generated template');
+    equal(actual.revision, 'Ember@1.11.1', 'revision is included in generated template');
   });
 
   QUnit.test('the template revision is different than the HTMLBars default revision', function() {
@@ -57387,6 +57443,25 @@ enifed('ember-views/tests/views/collection_test', ['ember-metal/core', 'ember-me
     }
   });
 
+  QUnit.test('Collection with style attribute supports changing content', function() {
+    view = CollectionView['default'].create({
+      attributeBindings: ['style'],
+      style: "width: 100px;",
+      content: Ember['default'].A(['foo', 'bar'])
+    });
+
+    run['default'](function() {
+      view.appendTo('#qunit-fixture');
+    });
+
+    equal(view.$().attr('style'), 'width: 100px;', "width is applied to the element");
+
+    run['default'](function() {
+      view.get('content').pushObject('baz');
+    });
+
+  });
+
 });
 enifed('ember-views/tests/views/collection_test.jscs-test', function () {
 
@@ -58455,6 +58530,63 @@ enifed('ember-views/tests/views/container_view_test', ['ember-metal/property_get
     ok(observerFired, 'View pushed, observer fired');
   });
 
+  QUnit.test('ContainerView supports bound attributes', function() {
+    container = ContainerView['default'].create({
+      attributeBindings: ['width'],
+      width: "100px"
+    });
+
+    run['default'](function() {
+      container.appendTo('#qunit-fixture');
+    });
+
+    equal(container.$().attr('width'), '100px', "width is applied to the element");
+
+    run['default'](function() {
+      container.set('width', '200px');
+    });
+
+    equal(container.$().attr('width'), '200px', "width is applied to the element");
+  });
+
+  QUnit.test('ContainerView supports bound style attribute', function() {
+    container = ContainerView['default'].create({
+      attributeBindings: ['style'],
+      style: "width: 100px;"
+    });
+
+    run['default'](function() {
+      container.appendTo('#qunit-fixture');
+    });
+
+    equal(container.$().attr('style'), 'width: 100px;', "width is applied to the element");
+
+    run['default'](function() {
+      container.set('style', 'width: 200px;');
+    });
+
+    equal(container.$().attr('style'), 'width: 200px;', "width is applied to the element");
+  });
+
+  QUnit.test('ContainerView supports changing children with style attribute', function() {
+    container = ContainerView['default'].create({
+      attributeBindings: ['style'],
+      style: "width: 100px;"
+    });
+
+    run['default'](function() {
+      container.appendTo('#qunit-fixture');
+    });
+
+    equal(container.$().attr('style'), 'width: 100px;', "width is applied to the element");
+
+    view = View['default'].create();
+
+    run['default'](function() {
+      container.pushObject(view);
+    });
+  });
+
 });
 enifed('ember-views/tests/views/container_view_test.jscs-test', function () {
 

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.11.0
+ * @version   1.11.1
  */
 
 (function() {
@@ -8917,7 +8917,28 @@ enifed('ember-htmlbars/tests/compat/helper_test', ['ember-htmlbars/compat/helper
       controller: {
         value: 'foo'
       },
-      template: compile['default']('{{#test}}foo{{/test}}')
+      template: compile['default']('{{#test}}{{value}}{{/test}}')
+    });
+
+    utils.runAppend(view);
+
+    equal(view.$().text(), 'foo');
+  });
+
+  QUnit.test('allows usage of the template inverse', function() {
+    expect(1);
+
+    function someHelper(options) {
+      options.inverse();
+    }
+
+    compat__helper.registerHandlebarsCompatibleHelper('test', someHelper);
+
+    view = EmberView['default'].create({
+      controller: {
+        value: 'foo'
+      },
+      template: compile['default']('{{#test}}Nothing to see here.{{else}}{{value}}{{/test}}')
     });
 
     utils.runAppend(view);
@@ -18900,7 +18921,8 @@ enifed('ember-htmlbars/tests/system/lookup-helper_test', ['ember-htmlbars/system
 
   function generateEnv(helpers) {
     return {
-      helpers: (helpers ? helpers : {})
+      helpers: (helpers ? helpers : {}),
+      data: { view: { } }
     };
   }
 
@@ -18987,7 +19009,11 @@ enifed('ember-htmlbars/tests/system/lookup-helper_test', ['ember-htmlbars/system
     var fakeOptions = {
       morph: { update: function() { } }
     };
-    var fakeEnv = {};
+    var fakeEnv = {
+      data: {
+        view: { }
+      }
+    };
     actual.helperFunction(fakeParams, fakeHash, fakeOptions, fakeEnv);
 
     ok(called, 'HTMLBars compatible wrapper is wraping the provided function');
@@ -19384,7 +19410,7 @@ enifed('ember-htmlbars/tests/system/render_view_test', ['ember-runtime/tests/uti
     view = EmberView['default'].create({
       template: {
         isHTMLBars: true,
-        revision: 'Ember@1.11.0',
+        revision: 'Ember@1.11.1',
         render: function(view, env, contextualElement, blockArguments) {
           for (var i = 0, l = keyNames.length; i < l; i++) {
             var keyName = keyNames[i];
@@ -33241,6 +33267,23 @@ enifed('ember-routing-htmlbars/tests/helpers/render_test', ['ember-metal/core',
     equal(view.$().text(), 'Hello other!');
   });
 
+  QUnit.test("{{render}} helper should not require view to provide its own template", function() {
+    var template = "{{render 'fish'}}";
+    var controller = controllers__controller["default"].extend({ container: container });
+    view = EmberView['default'].create({
+      controller: controller.create(),
+      template: compile['default'](template)
+    });
+
+    container._registry.register('template:fish', compile['default']('Hello fish!'));
+
+    container._registry.register('view:fish', EmberView['default'].extend());
+
+    tests__utils.runAppend(view);
+
+    equal(view.$().text(), 'Hello fish!');
+  });
+
 });
 enifed('ember-routing-htmlbars/tests/helpers/render_test.jscs-test', function () {
 
@@ -39017,6 +39060,19 @@ enifed('ember-runtime/tests/controllers/array_controller_test', ['ember-metal/co
     }
   });
 
+  QUnit.test('works properly when model is set to `null`', function() {
+    var controller = ArrayController['default'].create();
+
+    property_set.set(controller, 'model', null);
+    equal(property_get.get(controller, 'model'), null, "can set model to `null`");
+
+    property_set.set(controller, 'model', undefined);
+    equal(property_get.get(controller, 'model'), undefined, "can set model to `undefined`");
+
+    property_set.set(controller, 'model', false);
+    equal(property_get.get(controller, 'model'), false, "can set model to `undefined`");
+  });
+
 });
 enifed('ember-runtime/tests/controllers/array_controller_test.jscs-test', function () {
 
@@ -54534,7 +54590,7 @@ enifed('ember-template-compiler/tests/system/compile_test', ['ember-template-com
 
     var actual = compile['default'](templateString);
 
-    equal(actual.revision, 'Ember@1.11.0', 'revision is included in generated template');
+    equal(actual.revision, 'Ember@1.11.1', 'revision is included in generated template');
   });
 
   QUnit.test('the template revision is different than the HTMLBars default revision', function() {
@@ -59260,6 +59316,25 @@ enifed('ember-views/tests/views/collection_test', ['ember-metal/core', 'ember-me
     }
   });
 
+  QUnit.test('Collection with style attribute supports changing content', function() {
+    view = CollectionView['default'].create({
+      attributeBindings: ['style'],
+      style: "width: 100px;",
+      content: Ember['default'].A(['foo', 'bar'])
+    });
+
+    run['default'](function() {
+      view.appendTo('#qunit-fixture');
+    });
+
+    equal(view.$().attr('style'), 'width: 100px;', "width is applied to the element");
+
+    run['default'](function() {
+      view.get('content').pushObject('baz');
+    });
+
+  });
+
 });
 enifed('ember-views/tests/views/collection_test.jscs-test', function () {
 
@@ -60328,6 +60403,63 @@ enifed('ember-views/tests/views/container_view_test', ['ember-metal/property_get
     ok(observerFired, 'View pushed, observer fired');
   });
 
+  QUnit.test('ContainerView supports bound attributes', function() {
+    container = ContainerView['default'].create({
+      attributeBindings: ['width'],
+      width: "100px"
+    });
+
+    run['default'](function() {
+      container.appendTo('#qunit-fixture');
+    });
+
+    equal(container.$().attr('width'), '100px', "width is applied to the element");
+
+    run['default'](function() {
+      container.set('width', '200px');
+    });
+
+    equal(container.$().attr('width'), '200px', "width is applied to the element");
+  });
+
+  QUnit.test('ContainerView supports bound style attribute', function() {
+    container = ContainerView['default'].create({
+      attributeBindings: ['style'],
+      style: "width: 100px;"
+    });
+
+    run['default'](function() {
+      container.appendTo('#qunit-fixture');
+    });
+
+    equal(container.$().attr('style'), 'width: 100px;', "width is applied to the element");
+
+    run['default'](function() {
+      container.set('style', 'width: 200px;');
+    });
+
+    equal(container.$().attr('style'), 'width: 200px;', "width is applied to the element");
+  });
+
+  QUnit.test('ContainerView supports changing children with style attribute', function() {
+    container = ContainerView['default'].create({
+      attributeBindings: ['style'],
+      style: "width: 100px;"
+    });
+
+    run['default'](function() {
+      container.appendTo('#qunit-fixture');
+    });
+
+    equal(container.$().attr('style'), 'width: 100px;', "width is applied to the element");
+
+    view = View['default'].create();
+
+    run['default'](function() {
+      container.pushObject(view);
+    });
+  });
+
 });
 enifed('ember-views/tests/views/container_view_test.jscs-test', function () {