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

Literal args comma fix #1577

Merged
merged 14 commits into from
May 22, 2015
Merged

Literal args comma fix #1577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
be559b1
rename `effect.arg` to `effect.trigger` to avoid confusion with `effe…
May 18, 2015
db27411
support literal args in `_marshalArgs`
May 18, 2015
69c472f
require method expressions to use `,` as argument delimeter, trim whi…
May 18, 2015
3fd8fbb
basic test for computed expression containing literal args (must also…
May 18, 2015
89650a1
rename `standard/effects.html` to `standard/effectBuilder.html`
May 18, 2015
ab6ce1e
* do not treat literal arguments as effect triggers
May 19, 2015
6fd5ef8
`_executeStaticEffects` at configure-time
May 19, 2015
0fe9fe7
rudimentary test for a static effect (annotated computation with only…
May 19, 2015
42eaedd
* remove bogus support for arbitrary JSON in literal arguments, liter…
May 20, 2015
c001344
Accept no-arg computed fns as static. Fixes #1516.
kevinpschaaf May 22, 2015
cf5cba7
Update comment.
kevinpschaaf May 22, 2015
ffc361c
Add comment about escaping.
kevinpschaaf May 22, 2015
e6859b6
Move _executeStaticEffects to _applyConfig timing.
kevinpschaaf May 22, 2015
40a9578
Add corrected computedFromTrickyLiterals2 test.
kevinpschaaf May 22, 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 polymer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<link rel="import" href="src/standard/events.html">
<link rel="import" href="src/standard/gestures.html">
<link rel="import" href="src/standard/utils.html">
<link rel="import" href="src/standard/effects.html">
<link rel="import" href="src/standard/effectBuilder.html">
<link rel="import" href="src/standard/configure.html">
<link rel="import" href="src/standard/notify-path.html">
<link rel="import" href="src/standard/resolveUrl.html">
Expand Down
11 changes: 8 additions & 3 deletions src/lib/bind/effects.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,21 @@
for (var i=0, l=args.length; i<l; i++) {
var arg = args[i];
var name = arg.name;
var v = arg.structured ?
Polymer.Base.get(name, model) : model[name];
if (arg.literal) {
v = arg.value;
} else if (arg.structured) {
v = Polymer.Base.get(name, model);
} else {
v = model[name];
}
if (args.length > 1 && v === undefined) {
return;
}
if (arg.wildcard) {
// Only send the actual path changed info if the change that
// caused the observer to run matched the wildcard
var baseChanged = (name.indexOf(path + '.') === 0);
var matches = (effect.arg.name.indexOf(name) === 0 && !baseChanged);
var matches = (effect.trigger.name.indexOf(name) === 0 && !baseChanged);
values[i] = {
path: matches ? path : name,
value: matches ? value : v,
Expand Down
5 changes: 5 additions & 0 deletions src/standard/configure.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@
// configure: returns user supplied default property values
// combines with _config to create final property values
_configure: function() {
// some annotation data needs to be handed from host to client
// e.g. hand template content stored in notes to children as part of
// configure flow so templates have their content at ready time
this._configureAnnotationReferences();
// get individual default values from property configs
var config = {};
Expand Down Expand Up @@ -132,6 +135,8 @@

// Override polymer-mini thunk
_afterClientsReady: function() {
// process static effects, e.g. computations that have only literal arguments
this._executeStaticEffects();
this._applyConfig(this._config);
this._flushHandlers();
},
Expand Down
Loading