Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into idempotent rerender #11008

Merged
merged 7 commits into from
May 2, 2015
+5 −5
Merged

Merge master into idempotent rerender #11008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9681ce8
add code fences around ascii charts in text_support.js
EndangeredMassa Apr 30, 2015
37b21bf
Remove vestigial `states.changingKeys`
trek May 1, 2015
fd15503
Merge pull request #11001 from trek/move-qp-config-to-routes
machty May 1, 2015
4a9a4e6
Remove `_pCacheMeta` property on controllers, which appears to just be
trek May 1, 2015
8d720b9
Merge pull request #11003 from trek/remove-unused-controller-property
trek May 1, 2015
1ab4ccb
Merge pull request #10993 from EndangeredMassa/patch-1
mixonic May 2, 2015
c340bab
Merge branch 'master' into idempotent-rerender
krisselden May 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/ember-routing/lib/ext/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import ControllerMixin from "ember-runtime/mixins/controller";
*/

ControllerMixin.reopen({
concatenatedProperties: ['queryParams', '_pCacheMeta'],
concatenatedProperties: ['queryParams'],

init() {
this._super(...arguments);
Expand Down
4 changes: 0 additions & 4 deletions packages/ember-routing/lib/system/route.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}
}
};
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions packages/ember-views/lib/mixins/text_support.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
+---------------------------+
| |
Expand All @@ -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
Expand All @@ -75,6 +77,7 @@ import TargetActionSupport from "ember-runtime/mixins/target_action_support";
{{input attribute-name='controllerAction'}}
```

```
+--------------------+----------------+
| | |
| event | attribute name |
Expand All @@ -95,6 +98,7 @@ import TargetActionSupport from "ember-runtime/mixins/target_action_support";
| | |
| keydown | key-down |
+--------------------+----------------+
```

@class TextSupport
@namespace Ember
Expand Down