File tree 7 files changed +326
-222
lines changed
7 files changed +326
-222
lines changed Original file line number Diff line number Diff line change 14
14
< link rel ="import " href ="src/standard/events.html ">
15
15
< link rel ="import " href ="src/standard/gestures.html ">
16
16
< link rel ="import " href ="src/standard/utils.html ">
17
- < link rel ="import " href ="src/standard/effects .html ">
17
+ < link rel ="import " href ="src/standard/effectBuilder .html ">
18
18
< link rel ="import " href ="src/standard/configure.html ">
19
19
< link rel ="import " href ="src/standard/notify-path.html ">
20
20
< link rel ="import " href ="src/standard/resolveUrl.html ">
Original file line number Diff line number Diff line change 86
86
for ( var i = 0 , l = args . length ; i < l ; i ++ ) {
87
87
var arg = args [ i ] ;
88
88
var name = arg . name ;
89
- var v = arg . structured ?
90
- Polymer . Base . get ( name , model ) : model [ name ] ;
89
+ if ( arg . literal ) {
90
+ v = arg . value ;
91
+ } else if ( arg . structured ) {
92
+ v = Polymer . Base . get ( name , model ) ;
93
+ } else {
94
+ v = model [ name ] ;
95
+ }
91
96
if ( args . length > 1 && v === undefined ) {
92
97
return ;
93
98
}
94
99
if ( arg . wildcard ) {
95
100
// Only send the actual path changed info if the change that
96
101
// caused the observer to run matched the wildcard
97
102
var baseChanged = ( name . indexOf ( path + '.' ) === 0 ) ;
98
- var matches = ( effect . arg . name . indexOf ( name ) === 0 && ! baseChanged ) ;
103
+ var matches = ( effect . trigger . name . indexOf ( name ) === 0 && ! baseChanged ) ;
99
104
values [ i ] = {
100
105
path : matches ? path : name ,
101
106
value : matches ? value : v ,
Original file line number Diff line number Diff line change 67
67
// configure: returns user supplied default property values
68
68
// combines with _config to create final property values
69
69
_configure : function ( ) {
70
+ // some annotation data needs to be handed from host to client
71
+ // e.g. hand template content stored in notes to children as part of
72
+ // configure flow so templates have their content at ready time
70
73
this . _configureAnnotationReferences ( ) ;
71
74
// get individual default values from property configs
72
75
var config = { } ;
132
135
133
136
// Override polymer-mini thunk
134
137
_afterClientsReady : function ( ) {
138
+ // process static effects, e.g. computations that have only literal arguments
139
+ this . _executeStaticEffects ( ) ;
135
140
this . _applyConfig ( this . _config ) ;
136
141
this . _flushHandlers ( ) ;
137
142
} ,
You can’t perform that action at this time.
0 commit comments