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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7aa27d32b8959dce23d5b48b9743b90da89f916
-  data.tar.gz: 3be5dead084313c2c730b115659e061cdfdd2e16
+  metadata.gz: 086a0a3cf25b6ce5c88a612cc153c8f2f3d3a456
+  data.tar.gz: beee57123ee4957e7883a7ca67d4e122ba07ab24
 SHA512:
-  metadata.gz: 04257954b750f3065f8e56d73f4d3190e38fe00b22366ae28faf9c3d864b68c2c3b02a76a2e4d9673dd9e2832b90180621de673b3daa004418c0e02f0f03c8b4
-  data.tar.gz: a02e2f55d9de141959257571e7f9acd7b9ada0ffe5b2771da70ccd5d3c4ab577723cc040da42756f3c7967a5d9d5f46d28b1a078acd29a7307f7a08f2e764047
+  metadata.gz: e8d696cd7271578a9703a8d9869d0f1821640f728fe409815dded1de2a63a1681bcbbb05765de4673c3419d8af52bf4d02863c9d1a1802dbd24425e64da3571f
+  data.tar.gz: 572a0d900acf9fc3f8113e0f1673ac219134913de0017a52c2c1e4de3dc0d3f0e201d0023b029ec802aca12aba4d7436c2c48ccc10de620691bdf16228c65dd3

data/VERSION

@@ -1 +1 @@
-2.6.0-beta.2
+2.6.0-beta.3

data/dist/ember-runtime.js

@@ -6,7 +6,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   2.6.0-beta.2
+ * @version   2.6.0-beta.3
  */
 
 var enifed, requireModule, require, Ember;
@@ -688,12 +688,12 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
     /*
       Join the passed method with an existing queue and execute immediately,
       if there isn't one use `Backburner#run`.
-        The join method is like the run method except that it will schedule into
+       The join method is like the run method except that it will schedule into
       an existing queue if one already exists. In either case, the join method will
       immediately execute the passed in function and return its result.
-       @method join 
+       @method join
       @param {Object} target
-      @param {Function} method The method to be executed 
+      @param {Function} method The method to be executed
       @param {any} args The method arguments
       @return method result
     */
@@ -732,10 +732,10 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
 
     /*
       Defer the passed function to run inside the specified queue.
-       @method defer 
-      @param {String} queueName 
+       @method defer
+      @param {String} queueName
       @param {Object} target
-      @param {Function|String} method The method or method name to be executed 
+      @param {Function|String} method The method or method name to be executed
       @param {any} args The method arguments
       @return method result
     */
@@ -861,7 +861,7 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
         }
       }
 
-      var executeAt = Date.now() + parseInt(wait, 10);
+      var executeAt = Date.now() + parseInt(wait !== wait ? 0 : wait, 10);
 
       if (_backburnerUtils.isString(method)) {
         method = target[method];
@@ -3999,7 +3999,7 @@ enifed('ember-metal/computed', ['exports', 'ember-metal/debug', 'ember-metal/pro
     The alternative syntax, with prototype extensions, might look like:
   
     ```js
-    fullName() {
+    fullName: function() {
       return this.get('firstName') + ' ' + this.get('lastName');
     }.property('firstName', 'lastName')
     ```
@@ -4781,7 +4781,7 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
   
     @class Ember
     @static
-    @version 2.6.0-beta.2
+    @version 2.6.0-beta.3
     @public
   */
 
@@ -4823,11 +4823,11 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
   
     @property VERSION
     @type String
-    @default '2.6.0-beta.2'
+    @default '2.6.0-beta.3'
     @static
     @public
   */
-  Ember.VERSION = '2.6.0-beta.2';
+  Ember.VERSION = '2.6.0-beta.3';
 
   /**
     The hash of environment variables used to control various configuration

data/dist/ember-template-compiler.js

@@ -6,7 +6,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   2.6.0-beta.2
+ * @version   2.6.0-beta.3
  */
 
 var enifed, requireModule, require, Ember;
@@ -688,12 +688,12 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
     /*
       Join the passed method with an existing queue and execute immediately,
       if there isn't one use `Backburner#run`.
-        The join method is like the run method except that it will schedule into
+       The join method is like the run method except that it will schedule into
       an existing queue if one already exists. In either case, the join method will
       immediately execute the passed in function and return its result.
-       @method join 
+       @method join
       @param {Object} target
-      @param {Function} method The method to be executed 
+      @param {Function} method The method to be executed
       @param {any} args The method arguments
       @return method result
     */
@@ -732,10 +732,10 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
 
     /*
       Defer the passed function to run inside the specified queue.
-       @method defer 
-      @param {String} queueName 
+       @method defer
+      @param {String} queueName
       @param {Object} target
-      @param {Function|String} method The method or method name to be executed 
+      @param {Function|String} method The method or method name to be executed
       @param {any} args The method arguments
       @return method result
     */
@@ -861,7 +861,7 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
         }
       }
 
-      var executeAt = Date.now() + parseInt(wait, 10);
+      var executeAt = Date.now() + parseInt(wait !== wait ? 0 : wait, 10);
 
       if (_backburnerUtils.isString(method)) {
         method = target[method];
@@ -3206,7 +3206,7 @@ enifed('ember-metal/computed', ['exports', 'ember-metal/debug', 'ember-metal/pro
     The alternative syntax, with prototype extensions, might look like:
   
     ```js
-    fullName() {
+    fullName: function() {
       return this.get('firstName') + ' ' + this.get('lastName');
     }.property('firstName', 'lastName')
     ```
@@ -3988,7 +3988,7 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
   
     @class Ember
     @static
-    @version 2.6.0-beta.2
+    @version 2.6.0-beta.3
     @public
   */
 
@@ -4030,11 +4030,11 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
   
     @property VERSION
     @type String
-    @default '2.6.0-beta.2'
+    @default '2.6.0-beta.3'
     @static
     @public
   */
-  Ember.VERSION = '2.6.0-beta.2';
+  Ember.VERSION = '2.6.0-beta.3';
 
   /**
     The hash of environment variables used to control various configuration
@@ -12023,41 +12023,18 @@ enifed('ember-template-compiler/plugins/transform-closure-component-attrs-into-m
   */
   TransformClosureComponentAttrsIntoMut.prototype.transform = function TransformClosureComponentAttrsIntoMut_transform(ast) {
     var b = this.syntax.builders;
-    var walker = new this.syntax.Walker();
 
-    walker.visit(ast, function (node) {
-      if (validate(node)) {
-        processExpression(b, node);
+    this.syntax.traverse(ast, {
+      SubExpression: function (node) {
+        if (isComponentClosure(node)) {
+          mutParameters(b, node);
+        }
       }
     });
 
     return ast;
   };
 
-  function processExpression(builder, node) {
-    processSubExpressionsInNode(builder, node);
-
-    if (isComponentClosure(node)) {
-      mutParameters(builder, node);
-    }
-  }
-
-  function processSubExpressionsInNode(builder, node) {
-    for (var i = 0; i < node.params.length; i++) {
-      if (node.params[i].type === 'SubExpression') {
-        processExpression(builder, node.params[i]);
-      }
-    }
-
-    each(node.hash.pairs, function (pair) {
-      var value = pair.value;
-
-      if (value.type === 'SubExpression') {
-        processExpression(builder, value);
-      }
-    });
-  }
-
   function isComponentClosure(node) {
     return node.type === 'SubExpression' && node.path.original === 'component';
   }
@@ -12078,10 +12055,6 @@ enifed('ember-template-compiler/plugins/transform-closure-component-attrs-into-m
     });
   }
 
-  function validate(node) {
-    return node.type === 'BlockStatement' || node.type === 'MustacheStatement';
-  }
-
   function each(list, callback) {
     for (var i = 0, l = list.length; i < l; i++) {
       callback(list[i]);
@@ -12840,7 +12813,7 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
     options.buildMeta = function buildMeta(program) {
       return {
         fragmentReason: fragmentReason(program),
-        revision: 'Ember@2.6.0-beta.2',
+        revision: 'Ember@2.6.0-beta.3',
         loc: program.loc,
         moduleName: options.moduleName
       };

data/dist/ember-testing.js

@@ -6,7 +6,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   2.6.0-beta.2
+ * @version   2.6.0-beta.3
  */
 
 var enifed, requireModule, require, Ember;

data/dist/ember.debug.js

@@ -6,7 +6,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   2.6.0-beta.2
+ * @version   2.6.0-beta.3
  */
 
 var enifed, requireModule, require, Ember;
@@ -688,12 +688,12 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
     /*
       Join the passed method with an existing queue and execute immediately,
       if there isn't one use `Backburner#run`.
-        The join method is like the run method except that it will schedule into
+       The join method is like the run method except that it will schedule into
       an existing queue if one already exists. In either case, the join method will
       immediately execute the passed in function and return its result.
-       @method join 
+       @method join
       @param {Object} target
-      @param {Function} method The method to be executed 
+      @param {Function} method The method to be executed
       @param {any} args The method arguments
       @return method result
     */
@@ -732,10 +732,10 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
 
     /*
       Defer the passed function to run inside the specified queue.
-       @method defer 
-      @param {String} queueName 
+       @method defer
+      @param {String} queueName
       @param {Object} target
-      @param {Function|String} method The method or method name to be executed 
+      @param {Function|String} method The method or method name to be executed
       @param {any} args The method arguments
       @return method result
     */
@@ -861,7 +861,7 @@ enifed('backburner', ['exports', 'backburner/utils', 'backburner/platform', 'bac
         }
       }
 
-      var executeAt = Date.now() + parseInt(wait, 10);
+      var executeAt = Date.now() + parseInt(wait !== wait ? 0 : wait, 10);
 
       if (_backburnerUtils.isString(method)) {
         method = target[method];
@@ -8384,7 +8384,7 @@ enifed("ember-htmlbars/hooks/cleanup-render-node", ["exports"], function (export
     }
   }
 });
-enifed('ember-htmlbars/hooks/component', ['exports', 'ember-metal/features', 'ember-metal/debug', 'ember-htmlbars/node-managers/component-node-manager', 'ember-views/system/build-component-template', 'ember-htmlbars/utils/lookup-component', 'ember-metal/assign', 'ember-metal/empty_object', 'ember-metal/cache', 'ember-htmlbars/system/lookup-helper', 'ember-htmlbars/keywords/closure-component'], function (exports, _emberMetalFeatures, _emberMetalDebug, _emberHtmlbarsNodeManagersComponentNodeManager, _emberViewsSystemBuildComponentTemplate, _emberHtmlbarsUtilsLookupComponent, _emberMetalAssign, _emberMetalEmpty_object, _emberMetalCache, _emberHtmlbarsSystemLookupHelper, _emberHtmlbarsKeywordsClosureComponent) {
+enifed('ember-htmlbars/hooks/component', ['exports', 'ember-metal/features', 'ember-metal/debug', 'ember-htmlbars/node-managers/component-node-manager', 'ember-views/system/build-component-template', 'ember-htmlbars/utils/lookup-component', 'ember-metal/assign', 'ember-metal/empty_object', 'ember-metal/cache', 'ember-htmlbars/system/lookup-helper', 'ember-htmlbars/utils/extract-positional-params', 'ember-htmlbars/keywords/closure-component'], function (exports, _emberMetalFeatures, _emberMetalDebug, _emberHtmlbarsNodeManagersComponentNodeManager, _emberViewsSystemBuildComponentTemplate, _emberHtmlbarsUtilsLookupComponent, _emberMetalAssign, _emberMetalEmpty_object, _emberMetalCache, _emberHtmlbarsSystemLookupHelper, _emberHtmlbarsUtilsExtractPositionalParams, _emberHtmlbarsKeywordsClosureComponent) {
   'use strict';
 
   exports.default = componentHook;
@@ -8424,6 +8424,9 @@ enifed('ember-htmlbars/hooks/component', ['exports', 'ember-metal/features', 'em
 
     // Determine if this is an initial render or a re-render.
     if (state.manager) {
+      var templateMeta = state.manager.block.template.meta;
+      env.meta.moduleName = templateMeta && templateMeta.moduleName || env.meta && env.meta.moduleName;
+      _emberHtmlbarsUtilsExtractPositionalParams.default(renderNode, state.manager.component.constructor, params, attrs, false);
       state.manager.rerender(env, attrs, visitor);
       return;
     }
@@ -10315,7 +10318,7 @@ enifed('ember-htmlbars/keywords/outlet', ['exports', 'ember-metal/debug', 'ember
 
   'use strict';
 
-  _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.6.0-beta.2';
+  _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.6.0-beta.3';
 
   /**
     The `{{outlet}}` helper lets you specify where a child route will render in
@@ -12697,36 +12700,40 @@ enifed('ember-htmlbars/utils/extract-positional-params', ['exports', 'ember-meta
   exports.processPositionalParams = processPositionalParams;
 
   function extractPositionalParams(renderNode, component, params, attrs) {
+    var raiseAssertions = arguments.length <= 4 || arguments[4] === undefined ? true : arguments[4];
+
     var positionalParams = component.positionalParams;
 
     if (positionalParams) {
-      processPositionalParams(renderNode, positionalParams, params, attrs);
+      processPositionalParams(renderNode, positionalParams, params, attrs, raiseAssertions);
     }
   }
 
   function processPositionalParams(renderNode, positionalParams, params, attrs) {
+    var raiseAssertions = arguments.length <= 4 || arguments[4] === undefined ? true : arguments[4];
+
     var isRest = typeof positionalParams === 'string';
 
     if (isRest) {
-      processRestPositionalParameters(renderNode, positionalParams, params, attrs);
+      processRestPositionalParameters(renderNode, positionalParams, params, attrs, raiseAssertions);
     } else {
-      processNamedPositionalParameters(renderNode, positionalParams, params, attrs);
+      processNamedPositionalParameters(renderNode, positionalParams, params, attrs, raiseAssertions);
     }
   }
 
-  function processNamedPositionalParameters(renderNode, positionalParams, params, attrs) {
+  function processNamedPositionalParameters(renderNode, positionalParams, params, attrs, raiseAssertions) {
     var limit = Math.min(params.length, positionalParams.length);
 
     for (var i = 0; i < limit; i++) {
       var param = params[i];
 
-      _emberMetalDebug.assert('You cannot specify both a positional param (at position ' + i + ') and the hash argument `' + positionalParams[i] + '`.', !(positionalParams[i] in attrs));
+      _emberMetalDebug.assert('You cannot specify both a positional param (at position ' + i + ') and the hash argument `' + positionalParams[i] + '`.', !(positionalParams[i] in attrs && raiseAssertions));
 
       attrs[positionalParams[i]] = param;
     }
   }
 
-  function processRestPositionalParameters(renderNode, positionalParamsName, params, attrs) {
+  function processRestPositionalParameters(renderNode, positionalParamsName, params, attrs, raiseAssertions) {
     var nameInAttrs = (positionalParamsName in attrs);
 
     // when no params are used, do not override the specified `attrs.stringParamName` value
@@ -12735,7 +12742,7 @@ enifed('ember-htmlbars/utils/extract-positional-params', ['exports', 'ember-meta
     }
 
     // If there is already an attribute for that variable, do nothing
-    _emberMetalDebug.assert('You cannot specify positional parameters and the hash argument `' + positionalParamsName + '`.', !nameInAttrs);
+    _emberMetalDebug.assert('You cannot specify positional parameters and the hash argument `' + positionalParamsName + '`.', !(nameInAttrs && raiseAssertions));
 
     var paramsStream = new _emberMetalStreamsStream.Stream(function () {
       return _emberMetalStreamsUtils.readArray(params.slice(0));
@@ -14456,7 +14463,7 @@ enifed('ember-metal/computed', ['exports', 'ember-metal/debug', 'ember-metal/pro
     The alternative syntax, with prototype extensions, might look like:
   
     ```js
-    fullName() {
+    fullName: function() {
       return this.get('firstName') + ' ' + this.get('lastName');
     }.property('firstName', 'lastName')
     ```
@@ -15238,7 +15245,7 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
   
     @class Ember
     @static
-    @version 2.6.0-beta.2
+    @version 2.6.0-beta.3
     @public
   */
 
@@ -15280,11 +15287,11 @@ enifed('ember-metal/core', ['exports', 'require'], function (exports, _require)
   
     @property VERSION
     @type String
-    @default '2.6.0-beta.2'
+    @default '2.6.0-beta.3'
     @static
     @public
   */
-  Ember.VERSION = '2.6.0-beta.2';
+  Ember.VERSION = '2.6.0-beta.3';
 
   /**
     The hash of environment variables used to control various configuration
@@ -23540,6 +23547,25 @@ enifed('ember-routing/location/api', ['exports', 'ember-metal/debug', 'ember-met
   
     Calling setURL or replaceURL will not trigger onUpdateURL callbacks.
   
+    ## Custom implementation
+  
+    Ember scans `app/locations/*` for extending the Location API.
+  
+    Example:
+  
+    ```javascript
+    import Ember from 'ember';
+  
+    export default Ember.HistoryLocation.extend({
+      implementation: 'history-url-logging',
+  
+      pushState: function (path) {
+        console.log(path);
+        this._super.apply(this, arguments);
+      }
+    });
+    ```
+  
     @class Location
     @namespace Ember
     @static
@@ -29143,7 +29169,7 @@ enifed('ember-routing-htmlbars/keywords/render', ['exports', 'ember-metal/debug'
     return true;
   }
 });
-enifed('ember-routing-views/components/link-to', ['exports', 'ember-metal/features', 'ember-metal/logger', 'ember-metal/debug', 'ember-metal/property_get', 'ember-metal/computed', 'ember-metal/computed_macros', 'ember-views/system/utils', 'ember-views/components/component', 'ember-runtime/inject', 'ember-runtime/system/service', 'ember-runtime/mixins/controller', 'ember-htmlbars/templates/link-to', 'require'], function (exports, _emberMetalFeatures, _emberMetalLogger, _emberMetalDebug, _emberMetalProperty_get, _emberMetalComputed, _emberMetalComputed_macros, _emberViewsSystemUtils, _emberViewsComponentsComponent, _emberRuntimeInject, _emberRuntimeSystemService, _emberRuntimeMixinsController, _emberHtmlbarsTemplatesLinkTo, _require) {
+enifed('ember-routing-views/components/link-to', ['exports', 'ember-metal/features', 'ember-metal/logger', 'ember-metal/debug', 'ember-metal/property_get', 'ember-metal/computed', 'ember-metal/computed_macros', 'ember-views/system/utils', 'ember-views/components/component', 'ember-runtime/inject', 'ember-runtime/system/service', 'ember-runtime/mixins/controller', 'ember-htmlbars/node-managers/component-node-manager', 'ember-htmlbars/templates/link-to', 'require'], function (exports, _emberMetalFeatures, _emberMetalLogger, _emberMetalDebug, _emberMetalProperty_get, _emberMetalComputed, _emberMetalComputed_macros, _emberViewsSystemUtils, _emberViewsComponentsComponent, _emberRuntimeInject, _emberRuntimeSystemService, _emberRuntimeMixinsController, _emberHtmlbarsNodeManagersComponentNodeManager, _emberHtmlbarsTemplatesLinkTo, _require) {
   /**
   @module ember
   @submodule ember-templates
@@ -29790,7 +29816,7 @@ enifed('ember-routing-views/components/link-to', ['exports', 'ember-metal/featur
       if (lastParam && lastParam.isQueryParams) {
         params.pop();
       }
-      var onlyQueryParamsSupplied = params.length === 0;
+      var onlyQueryParamsSupplied = this[_emberHtmlbarsNodeManagersComponentNodeManager.HAS_BLOCK] ? params.length === 0 : params.length === 1;
       if (onlyQueryParamsSupplied) {
         return _emberMetalProperty_get.get(this, '_routing.currentRouteName');
       }
@@ -29903,7 +29929,10 @@ enifed('ember-routing-views/components/link-to', ['exports', 'ember-metal/featur
       }
 
       // Process the positional arguments, in order.
-      // 1. Inline link title was shifted off by AST.
+      // 1. Inline link title comes first, if present.
+      if (!this[_emberHtmlbarsNodeManagersComponentNodeManager.HAS_BLOCK]) {
+        this.set('linkTitle', params.shift());
+      }
 
       // 2. `targetRouteName` is now always at index 0.
       this.set('targetRouteName', params[0]);
@@ -38320,41 +38349,18 @@ enifed('ember-template-compiler/plugins/transform-closure-component-attrs-into-m
   */
   TransformClosureComponentAttrsIntoMut.prototype.transform = function TransformClosureComponentAttrsIntoMut_transform(ast) {
     var b = this.syntax.builders;
-    var walker = new this.syntax.Walker();
 
-    walker.visit(ast, function (node) {
-      if (validate(node)) {
-        processExpression(b, node);
+    this.syntax.traverse(ast, {
+      SubExpression: function (node) {
+        if (isComponentClosure(node)) {
+          mutParameters(b, node);
+        }
       }
     });
 
     return ast;
   };
 
-  function processExpression(builder, node) {
-    processSubExpressionsInNode(builder, node);
-
-    if (isComponentClosure(node)) {
-      mutParameters(builder, node);
-    }
-  }
-
-  function processSubExpressionsInNode(builder, node) {
-    for (var i = 0; i < node.params.length; i++) {
-      if (node.params[i].type === 'SubExpression') {
-        processExpression(builder, node.params[i]);
-      }
-    }
-
-    each(node.hash.pairs, function (pair) {
-      var value = pair.value;
-
-      if (value.type === 'SubExpression') {
-        processExpression(builder, value);
-      }
-    });
-  }
-
   function isComponentClosure(node) {
     return node.type === 'SubExpression' && node.path.original === 'component';
   }
@@ -38375,10 +38381,6 @@ enifed('ember-template-compiler/plugins/transform-closure-component-attrs-into-m
     });
   }
 
-  function validate(node) {
-    return node.type === 'BlockStatement' || node.type === 'MustacheStatement';
-  }
-
   function each(list, callback) {
     for (var i = 0, l = list.length; i < l; i++) {
       callback(list[i]);
@@ -39137,7 +39139,7 @@ enifed('ember-template-compiler/system/compile_options', ['exports', 'ember-meta
     options.buildMeta = function buildMeta(program) {
       return {
         fragmentReason: fragmentReason(program),
-        revision: 'Ember@2.6.0-beta.2',
+        revision: 'Ember@2.6.0-beta.3',
         loc: program.loc,
         moduleName: options.moduleName
       };