dist/ember.prod.js in ember-source-2.4.5 vs dist/ember.prod.js in ember-source-2.4.6

@@ -4,11 +4,11 @@
  * @copyright Copyright 2011-2016 Tilde Inc. and contributors
  *            Portions Copyright 2006-2011 Strobe Inc.
  *            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.4.5
+ * @version   2.4.6
  */
 
 var enifed, requireModule, require, requirejs, Ember;
 var mainContext = this;
 
@@ -9923,11 +9923,11 @@
   @submodule ember-templates
   */
 
   'use strict';
 
-  _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.4.5';
+  _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.4.6';
 
   /**
     The `{{outlet}}` helper lets you specify where a child routes will render in
     your template. An important use of the `{{outlet}}` helper is in your
     application's `application.hbs` file:
@@ -15420,11 +15420,11 @@
     cross-platform libraries such as jQuery. For more details, see
     [Ember-Runtime](http://emberjs.com/api/modules/ember-runtime.html).
   
     @class Ember
     @static
-    @version 2.4.5
+    @version 2.4.6
     @public
   */
 
   if ('undefined' === typeof Ember) {
     // Create core object. Make it act like an instance of Ember.Namespace so that
@@ -15462,15 +15462,15 @@
   /**
     The semantic version.
   
     @property VERSION
     @type String
-    @default '2.4.5'
+    @default '2.4.6'
     @static
     @public
   */
-  Ember.VERSION = '2.4.5';
+  Ember.VERSION = '2.4.6';
 
   /**
     The hash of environment variables used to control various configuration
     settings. To specify your own or override default settings, add the
     desired properties to a global hash named `EmberENV` (or `ENV` for
@@ -25424,11 +25424,11 @@
         var qpMap = _emberMetalProperty_get.get(this, '_qp').map;
 
         var totalChanged = Object.keys(changed).concat(Object.keys(removed));
         for (var i = 0, len = totalChanged.length; i < len; ++i) {
           var qp = qpMap[totalChanged[i]];
-          if (qp && _emberMetalProperty_get.get(this._optionsForQueryParam(qp), 'refreshModel') && this.router.currentState) {
+          if (qp && _emberMetalProperty_get.get(this._optionsForQueryParam(qp), 'refreshModel')) {
             this.refresh();
           }
         }
 
         return true;
@@ -27406,16 +27406,10 @@
 
     _doTransition: function (_targetRouteName, models, _queryParams) {
       var targetRouteName = _targetRouteName || _emberRoutingUtils.getActiveTargetName(this.router);
 
       var queryParams = {};
-      // merge in any queryParams from the active transition which could include
-      // queryparams from the url on initial load.
-      if (this.router.activeTransition) {
-        _emberMetalAssign.default(queryParams, this.router.activeTransition.queryParams);
-      }
-
       _emberMetalAssign.default(queryParams, _queryParams);
       this._prepareQueryParams(targetRouteName, models, queryParams);
 
       var transitionArgs = _emberRoutingUtils.routeArgs(targetRouteName, models, queryParams);
       var transition = this.router.transitionTo.apply(this.router, transitionArgs);
@@ -29387,11 +29381,11 @@
   @submodule ember-routing-views
   */
 
   'use strict';
 
-  _emberHtmlbarsTemplatesLinkTo.default.meta.revision = 'Ember@2.4.5';
+  _emberHtmlbarsTemplatesLinkTo.default.meta.revision = 'Ember@2.4.6';
 
   /**
     `Ember.LinkComponent` renders an element whose `click` event triggers a
     transition of the application's instance of `Ember.Router` to
     a supplied route by name.
@@ -29887,11 +29881,11 @@
   @submodule ember-routing-views
   */
 
   'use strict';
 
-  _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.4.5';
+  _emberHtmlbarsTemplatesTopLevelView.default.meta.revision = 'Ember@2.4.6';
 
   var CoreOutletView = _emberViewsViewsView.default.extend({
     defaultTemplate: _emberHtmlbarsTemplatesTopLevelView.default,
 
     init: function () {
@@ -38943,11 +38937,11 @@
     options.plugins = plugins;
 
     options.buildMeta = function buildMeta(program) {
       return {
         fragmentReason: fragmentReason(program),
-        revision: 'Ember@2.4.5',
+        revision: 'Ember@2.4.6',
         loc: program.loc,
         moduleName: options.moduleName
       };
     };
 
@@ -43110,10 +43104,10 @@
   exports.DeprecatedCollectionView = DeprecatedCollectionView;
 });
 enifed('ember-views/views/container_view', ['exports', 'ember-metal/core', 'ember-metal/debug', 'ember-runtime/mixins/mutable_array', 'ember-runtime/system/native_array', 'ember-views/views/view', 'ember-metal/property_get', 'ember-metal/property_set', 'ember-metal/mixin', 'ember-metal/events', 'ember-htmlbars/templates/container-view'], function (exports, _emberMetalCore, _emberMetalDebug, _emberRuntimeMixinsMutable_array, _emberRuntimeSystemNative_array, _emberViewsViewsView, _emberMetalProperty_get, _emberMetalProperty_set, _emberMetalMixin, _emberMetalEvents, _emberHtmlbarsTemplatesContainerView) {
   'use strict';
 
-  _emberHtmlbarsTemplatesContainerView.default.meta.revision = 'Ember@2.4.5';
+  _emberHtmlbarsTemplatesContainerView.default.meta.revision = 'Ember@2.4.6';
 
   /**
   @module ember
   @submodule ember-views
   */