ember-source 1.10.0.beta.2 → 1.10.0.beta.3

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-beta.2
+ * @version   1.10.0-beta.3
  */
 
 (function() {
@@ -153,7 +153,9 @@ enifed("ember-debug",
     Ember.warn = function(message, test) {
       if (!test) {
         Logger.warn("WARNING: "+message);
-        if ('trace' in Logger) Logger.trace();
+        if ('trace' in Logger) {
+          Logger.trace();
+        }
       }
     };
 

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-beta.2
+ * @version   1.10.0-beta.3
  */
 
 (function() {
@@ -4037,78 +4037,6 @@ enifed("ember-htmlbars.jshint",
       ok(true, 'ember-htmlbars.js should pass jshint.'); 
     });
   });
-enifed("ember-htmlbars/attr_nodes.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars');
-    test('ember-htmlbars/attr_nodes.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/attr_nodes.js should pass jshint.'); 
-    });
-  });
-enifed("ember-htmlbars/attr_nodes/legacy_bind.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/attr_nodes');
-    test('ember-htmlbars/attr_nodes/legacy_bind.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/attr_nodes/legacy_bind.js should pass jshint.'); 
-    });
-  });
-enifed("ember-htmlbars/attr_nodes/quoted.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/attr_nodes');
-    test('ember-htmlbars/attr_nodes/quoted.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/attr_nodes/quoted.js should pass jshint.'); 
-    });
-  });
-enifed("ember-htmlbars/attr_nodes/sanitized.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/attr_nodes');
-    test('ember-htmlbars/attr_nodes/sanitized.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/attr_nodes/sanitized.js should pass jshint.'); 
-    });
-  });
-enifed("ember-htmlbars/attr_nodes/simple.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/attr_nodes');
-    test('ember-htmlbars/attr_nodes/simple.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/attr_nodes/simple.js should pass jshint.'); 
-    });
-  });
-enifed("ember-htmlbars/attr_nodes/unquoted.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/attr_nodes');
-    test('ember-htmlbars/attr_nodes/unquoted.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/attr_nodes/unquoted.js should pass jshint.'); 
-    });
-  });
-enifed("ember-htmlbars/attr_nodes/unquoted_nonproperty.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/attr_nodes');
-    test('ember-htmlbars/attr_nodes/unquoted_nonproperty.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/attr_nodes/unquoted_nonproperty.js should pass jshint.'); 
-    });
-  });
-enifed("ember-htmlbars/attr_nodes/utils.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/attr_nodes');
-    test('ember-htmlbars/attr_nodes/utils.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/attr_nodes/utils.js should pass jshint.'); 
-    });
-  });
 enifed("ember-htmlbars/compat.jshint",
   [],
   function() {
@@ -4325,6 +4253,15 @@ enifed("ember-htmlbars/hooks/attribute.jshint",
       ok(true, 'ember-htmlbars/hooks/attribute.js should pass jshint.'); 
     });
   });
+enifed("ember-htmlbars/hooks/block.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-htmlbars/hooks');
+    test('ember-htmlbars/hooks/block.js should pass jshint', function() { 
+      ok(true, 'ember-htmlbars/hooks/block.js should pass jshint.'); 
+    });
+  });
 enifed("ember-htmlbars/hooks/component.jshint",
   [],
   function() {
@@ -4370,6 +4307,15 @@ enifed("ember-htmlbars/hooks/get.jshint",
       ok(true, 'ember-htmlbars/hooks/get.js should pass jshint.'); 
     });
   });
+enifed("ember-htmlbars/hooks/inline.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-htmlbars/hooks');
+    test('ember-htmlbars/hooks/inline.js should pass jshint', function() { 
+      ok(true, 'ember-htmlbars/hooks/inline.js should pass jshint.'); 
+    });
+  });
 enifed("ember-htmlbars/hooks/set.jshint",
   [],
   function() {
@@ -4551,6 +4497,13 @@ enifed("ember-htmlbars/tests/attr_nodes/nonmatching_reflection_test",
       run(function() { view.appendTo('#qunit-fixture'); });
     }
 
+    function canSetFalsyMaxLength() {
+      var input = document.createElement('input');
+      input.maxLength = 0;
+
+      return input.maxLength === 0;
+    }
+
       });
 enifed("ember-htmlbars/tests/attr_nodes/nonmatching_reflection_test.jshint",
   [],
@@ -6211,7 +6164,7 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
 
     test("should keep class in the order it appears in", function() {
       view = EmberView.create({
-        template: compile('<span {{bind-attr class=":foo :baz"}}></span>'),
+        template: compile('<span {{bind-attr class=":foo :baz"}}></span>')
       });
 
       runAppend(view);
@@ -6287,6 +6240,8 @@ enifed("ember-htmlbars/tests/helpers/bind_test",
         container.optionsForType('template', { instantiate: false });
         container.register('view:default', _MetamorphView);
         container.register('view:toplevel', EmberView.extend());
+
+        expectDeprecation('The `{{bind}}` helper has been deprecated and will be removed.');
       },
       teardown: function() {
         runDestroy(container);
@@ -6354,6 +6309,8 @@ enifed("ember-htmlbars/tests/helpers/bind_test",
       setup: function() {
         container = new Container();
         container.optionsForType('template', { instantiate: false });
+
+        expectDeprecation('The `{{bind}}` helper has been deprecated and will be removed.');
       },
       teardown: function() {
         runDestroy(container);
@@ -8369,12 +8326,12 @@ enifed("ember-htmlbars/tests/helpers/if_unless_test",
     test("The `unless` helper does not error on undefined", function() {
       view = EmberView.create({
         undefinedValue: undefined,
-        template: compile('{{#unless view.undefinedValue}}Yep{{/unless}}{{#unbound unless view.undefinedValue}}Yep{{/unbound}}')
+        template: compile('{{#unless view.undefinedValue}}YepBound{{/unless}}{{#unbound unless view.undefinedValue}}YepUnbound{{/unbound}}')
       });
 
       runAppend(view);
 
-      equal(view.$().text(), 'YepYep');
+      equal(view.$().text(), 'YepBoundYepUnbound');
     });
 
     test("The `if` helper does not print the contents for an object proxy without content", function() {
@@ -8595,29 +8552,6 @@ enifed("ember-htmlbars/tests/helpers/if_unless_test",
       equal(view.$().text(), '');
     });
 
-    test('views within an if statement should be sane on re-render', function() {
-      view = EmberView.create({
-        template: compile('{{#if view.display}}{{input}}{{/if}}'),
-        display: false
-      });
-
-      runAppend(view);
-
-      equal(view.$('input').length, 0);
-
-      run(function() {
-        // Setting twice will trigger the observer twice, this is intentional
-        view.set('display', true);
-        view.set('display', 'yes');
-      });
-
-      var textfield = view.$('input');
-      equal(textfield.length, 1);
-
-      // Make sure the view is still registered in View.views
-      ok(EmberView.views[textfield.attr('id')]);
-    });
-
     test('should update the block when object passed to #if helper changes', function() {
       container.register('template:menu', compile('<h1>{{#if view.inception}}{{view.INCEPTION}}{{/if}}</h1>'));
 
@@ -8781,29 +8715,6 @@ enifed("ember-htmlbars/tests/helpers/if_unless_test",
       equal(view.$().text(), '');
     });
 
-    test('views within an if statement should be sane on re-render', function() {
-      view = EmberView.create({
-        template: compile('{{#if view.display}}{{input}}{{/if}}'),
-        display: false
-      });
-
-      runAppend(view);
-
-      equal(view.$('input').length, 0);
-
-      run(function() {
-        // Setting twice will trigger the observer twice, this is intentional
-        view.set('display', true);
-        view.set('display', 'yes');
-      });
-
-      var textfield = view.$('input');
-      equal(textfield.length, 1);
-
-      // Make sure the view is still registered in View.views
-      ok(EmberView.views[textfield.attr('id')]);
-    });
-
     test('should update the block when object passed to #if helper changes', function() {
       container.register('template:menu', compile('<h1>{{#if view.inception}}{{view.INCEPTION}}{{/if}}</h1>'));
 
@@ -8871,29 +8782,6 @@ enifed("ember-htmlbars/tests/helpers/if_unless_test",
       });
     });
 
-    test('views within an if statement should be sane on re-render', function() {
-      view = EmberView.create({
-        template: compile('{{#if view.display}}{{input}}{{/if}}'),
-        display: false
-      });
-
-      runAppend(view);
-
-      equal(view.$('input').length, 0);
-
-      run(function() {
-        // Setting twice will trigger the observer twice, this is intentional
-        view.set('display', true);
-        view.set('display', 'yes');
-      });
-
-      var textfield = view.$('input');
-      equal(textfield.length, 1);
-
-      // Make sure the view is still registered in View.views
-      ok(EmberView.views[textfield.attr('id')]);
-    });
-
     test('the {{this}} helper should not fail on removal', function() {
       view = EmberView.create({
         context: 'abc',
@@ -9454,7 +9342,7 @@ enifed("ember-htmlbars/tests/helpers/log_test",
     test('should be able to log `this`', function() {
       view = EmberView.create({
         context: 'one',
-        template: compile('{{log this}}'),
+        template: compile('{{log this}}')
       });
 
       runAppend(view);
@@ -13159,7 +13047,7 @@ enifed("ember-htmlbars/tests/integration/escape_integration_test",
     test('should escape HTML in primitive value contexts when using normal mustaches', function() {
       view = EmberView.create({
         context: '<b>Max</b><b>James</b>',
-        template: compile('{{this}}'),
+        template: compile('{{this}}')
       });
 
       runAppend(view);
@@ -13178,7 +13066,7 @@ enifed("ember-htmlbars/tests/integration/escape_integration_test",
     test('should not escape HTML in primitive value contexts when using triple mustaches', function() {
       view = EmberView.create({
         context: '<b>Max</b><b>James</b>',
-        template: compile('{{{this}}}'),
+        template: compile('{{{this}}}')
       });
 
       runAppend(view);
@@ -15661,6 +15549,12 @@ enifed("ember-metal/tests/accessors/mandatory_setters_test",
 
     QUnit.module('mandatory-setters');
 
+    function hasMandatorySetter(object, property) {
+      var meta = metaFor(object);
+
+      return property in meta.values;
+    }
+
     
       if (hasPropertyAccessors) {
         test('does not assert if property is not being watched', function() {
@@ -15675,6 +15569,50 @@ enifed("ember-metal/tests/accessors/mandatory_setters_test",
           equal(get(obj, 'someProp'), 'blastix');
         });
 
+        test('should not setup mandatory-setter if property is not writable', function() {
+          expect(6);
+
+          var obj = { };
+
+          defineProperty(obj, 'a', { value: true });
+          defineProperty(obj, 'b', { value: false });
+          defineProperty(obj, 'c', { value: undefined });
+          defineProperty(obj, 'd', { value: undefined, writable: false});
+          defineProperty(obj, 'e', { value: undefined, configurable: false});
+          defineProperty(obj, 'f', { value: undefined, configurable: true});
+
+          watch(obj, 'a');
+          watch(obj, 'b');
+          watch(obj, 'c');
+          watch(obj, 'd');
+          watch(obj, 'e');
+          watch(obj, 'f');
+
+          ok(!hasMandatorySetter(obj, 'a'), 'mandatory-setter should not be installed');
+          ok(!hasMandatorySetter(obj, 'b'), 'mandatory-setter should not be installed');
+          ok(!hasMandatorySetter(obj, 'c'), 'mandatory-setter should not be installed');
+          ok(!hasMandatorySetter(obj, 'd'), 'mandatory-setter should not be installed');
+          ok(!hasMandatorySetter(obj, 'e'), 'mandatory-setter should not be installed');
+          ok(!hasMandatorySetter(obj, 'f'), 'mandatory-setter should not be installed');
+        });
+
+        test('should not setup mandatory-setter if setter is already setup on property', function() {
+          expect(2);
+
+          var obj = { someProp: null };
+
+          defineProperty(obj, 'someProp', {
+            set: function(value) {
+              equal(value, 'foo-bar', 'custom setter was called');
+            }
+          });
+
+          watch(obj, 'someProp');
+          ok(!hasMandatorySetter(obj, 'someProp'), 'mandatory-setter should not be installed');
+
+          obj.someProp = 'foo-bar';
+        });
+
         test('should assert if set without Ember.set when property is being watched', function() {
           var obj = {
             someProp: null,
@@ -19397,7 +19335,7 @@ enifed("ember-metal/tests/map_test",
         var expectations = [
           { value: 1, key: "a", context: unboundThis },
           { value: 2, key: "b", context: unboundThis },
-          { value: 3, key: "c", context: unboundThis },
+          { value: 3, key: "c", context: unboundThis }
         ];
 
         map.forEach(function(value, key, theMap) {
@@ -19425,7 +19363,7 @@ enifed("ember-metal/tests/map_test",
         var expectations = [
           { value: 1, key: "a", context: context },
           { value: 2, key: "b", context: context },
-          { value: 3, key: "c", context: context },
+          { value: 3, key: "c", context: context }
         ];
 
         map.forEach(function(value, key, theMap) {
@@ -19484,7 +19422,7 @@ enifed("ember-metal/tests/map_test",
           { value: 1, key: "a", context: unboundThis },
           { value: 2, key: "b", context: unboundThis },
           { value: 3, key: "c", context: unboundThis },
-          { value: 4, key: "d", context: unboundThis },
+          { value: 4, key: "d", context: unboundThis }
         ];
 
         map.forEach(function(value, key, theMap) {
@@ -26442,7 +26380,7 @@ enifed("ember-routing-htmlbars/tests/helpers/outlet_test",
     test("should not throw deprecations if {{outlet}} is used with a quoted name", function() {
       expectNoDeprecation();
       view = EmberView.create({
-        template: compile("{{outlet \"foo\"}}"),
+        template: compile("{{outlet \"foo\"}}")
       });
       runAppend(view);
     });
@@ -26450,7 +26388,7 @@ enifed("ember-routing-htmlbars/tests/helpers/outlet_test",
     
       test("should throw an assertion if {{outlet}} used with unquoted name", function() {
         view = EmberView.create({
-          template: compile("{{outlet foo}}"),
+          template: compile("{{outlet foo}}")
         });
         expectAssertion(function() {
           runAppend(view);
@@ -28220,7 +28158,8 @@ enifed("ember-routing/tests/system/controller_for_test",
     });
 
     test("generateController should create App.ObjectController if provided", function() {
-      var context = {}, controller;
+      var context = {};
+      var controller;
       namespace.ObjectController = ObjectController.extend();
 
       controller = generateController(container, 'home', context);
@@ -28230,7 +28169,8 @@ enifed("ember-routing/tests/system/controller_for_test",
     });
 
     test("generateController should create App.ArrayController if provided", function() {
-      var context = Ember.A(), controller;
+      var context = Ember.A();
+      var controller;
       namespace.ArrayController = ArrayController.extend();
 
       controller = generateController(container, 'home', context);
@@ -28562,8 +28502,8 @@ enifed("ember-routing/tests/system/route_test",
 
         container.register('service:auth', Service.extend());
 
-        var appRoute = container.lookup('route:application'),
-          authService = container.lookup('service:auth');
+        var appRoute = container.lookup('route:application');
+        var authService = container.lookup('service:auth');
 
         equal(authService, appRoute.get('authService'), "service.auth is injected");
       });
@@ -29561,6 +29501,20 @@ enifed("ember-runtime/tests/computed/reduce_computed_macros_test",
       deepEqual(get(obj, 'filtered'), ['b'], "index is passed to callback correctly");
     });
 
+    test("it passes the array to the callback", function() {
+      var array = Ember.A(['a', 'b', 'c']);
+
+      run(function() {
+        obj = EmberObject.createWithMixins({
+          array: array,
+          filtered: computedFilter('array', function (item, index, array) { return index === array.get('length') - 2; })
+        });
+        get(obj, 'filtered');
+      });
+
+      deepEqual(get(obj, 'filtered'), ['b'], "array is passed to callback correctly");
+    });
+
     test("it caches properly", function() {
       var array = get(obj, 'array');
       get(obj, 'filtered');
@@ -46761,7 +46715,9 @@ enifed("ember-testing/tests/adapters/adapter_test",
     // });
 
     test("exception throws", function() {
-      var error = "Hai", thrown;
+      var error = "Hai";
+      var thrown;
+
       try {
         adapter.exception(error);
       } catch (e) {
@@ -48010,6 +47966,24 @@ enifed("ember-views.jshint",
       ok(true, 'ember-views.js should pass jshint.'); 
     });
   });
+enifed("ember-views/attr_nodes/attr_node.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-views/attr_nodes');
+    test('ember-views/attr_nodes/attr_node.js should pass jshint', function() { 
+      ok(true, 'ember-views/attr_nodes/attr_node.js should pass jshint.'); 
+    });
+  });
+enifed("ember-views/attr_nodes/legacy_bind.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-views/attr_nodes');
+    test('ember-views/attr_nodes/legacy_bind.js should pass jshint', function() { 
+      ok(true, 'ember-views/attr_nodes/legacy_bind.js should pass jshint.'); 
+    });
+  });
 enifed("ember-views/component_lookup.jshint",
   [],
   function() {
@@ -52420,7 +52394,7 @@ enifed("ember-views/tests/views/simple_bound_view_test",
       var isEscaped = true;
       var view = new SimpleBoundView(lazyValue, isEscaped);
       view._morph = {
-        update: function(newValue) {
+        setContent: function(newValue) {
           value = newValue;
         }
       };
@@ -52429,19 +52403,19 @@ enifed("ember-views/tests/views/simple_bound_view_test",
 
       view.update();
 
-      equal(value, 'bar', 'expected call to morph.update with "bar"');
+      equal(value, 'bar', 'expected call to morph.setContent with "bar"');
       value = null;
 
       view.update();
 
-      equal(value, null, 'expected no call to morph.update');
+      equal(value, null, 'expected no call to morph.setContent');
 
       obj.foo = 'baz'; // change property
       lazyValue.notify();
 
       view.update();
 
-      equal(value, 'baz', 'expected call to morph.update with "baz"');
+      equal(value, 'baz', 'expected call to morph.setContent with "baz"');
     });
   });
 enifed("ember-views/tests/views/simple_bound_view_test.jshint",
@@ -61778,7 +61752,8 @@ enifed("ember/tests/routing/basic_test",
         this.route("home");
       });
 
-      var chooseFollowed = 0, destination;
+      var chooseFollowed = 0;
+      var destination;
 
       App.ChooseRoute = Ember.Route.extend({
         redirect: function() {
@@ -63471,7 +63446,8 @@ enifed("ember/tests/routing/query_params_test",
       });
     }
 
-    var startingURL = '', expectedReplaceURL, expectedPushURL;
+    var startingURL = '';
+    var expectedReplaceURL, expectedPushURL;
 
     function setAndFlush(obj, prop, value) {
       Ember.run(obj, 'set', prop, value);