Merge pull request #11008 from krisselden/idempotent-rerender

Merge master into idempotent rerender
emberjs · May 2, 2015 · a3d4eba · a3d4eba
2 parents a4dffa9 + c340bab
commit a3d4eba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/packages/ember-routing/lib/ext/controller.js b/packages/ember-routing/lib/ext/controller.js
@@ -13,7 +13,7 @@ import ControllerMixin from "ember-runtime/mixins/controller";
 */
 
 ControllerMixin.reopen({
-  concatenatedProperties: ['queryParams', '_pCacheMeta'],
+  concatenatedProperties: ['queryParams'],
 
   init() {
     this._super(...arguments);

diff --git a/packages/ember-routing/lib/system/route.js b/packages/ember-routing/lib/system/route.js
@@ -147,9 +147,6 @@ var Route = EmberObject.extend(ActionHandler, Evented, {
         },
         allowOverrides: (controller, prop) => {
           return this._updatingQPChanged(controller, map[prop]);
-        },
-        changingKeys: (controller, prop) => {
-          return this._updateSerializedQPValue(controller, map[prop]);
         }
       }
     };
@@ -1096,7 +1093,6 @@ var Route = EmberObject.extend(ActionHandler, Evented, {
       if (transition) {
         // Update the model dep values used to calculate cache keys.
         stashParamNames(this.router, transition.state.handlerInfos);
-        controller._qpDelegate = states.changingKeys;
         controller._updateCacheParams(transition.params);
       }
       controller._qpDelegate = states.allowOverrides;

diff --git a/packages/ember-views/lib/mixins/text_support.js b/packages/ember-views/lib/mixins/text_support.js
@@ -42,6 +42,7 @@ import TargetActionSupport from "ember-runtime/mixins/target_action_support";
   The following chart is a visual representation of what takes place when the
   escape key is pressed in this scenario:
 
+  ```
   The Template
   +---------------------------+
   |                           |
@@ -66,6 +67,7 @@ import TargetActionSupport from "ember-runtime/mixins/target_action_support";
   |  }                                        |
   |                                           |
   +-------------------------------------------+
+  ```
 
   Here are the events that we currently support along with the name of the
   attribute you would need to use on your field. To reiterate, you would use the
@@ -75,6 +77,7 @@ import TargetActionSupport from "ember-runtime/mixins/target_action_support";
     {{input attribute-name='controllerAction'}}
   ```
 
+  ```
   +--------------------+----------------+
   |                    |                |
   | event              | attribute name |
@@ -95,6 +98,7 @@ import TargetActionSupport from "ember-runtime/mixins/target_action_support";
   |                    |                |
   | keydown            | key-down       |
   +--------------------+----------------+
+  ```
 
   @class TextSupport
   @namespace Ember