mirror of
https://github.com/Polymer/polymer.git
synced 2025-02-25 18:55:30 -06:00
Merge pull request #1577 from Polymer/literal-args-comma-fix
Literal args comma fix
This commit is contained in:
@@ -13,11 +13,18 @@
|
||||
style$="{{boundStyle}}"
|
||||
data-id$="{{dataSetId}}"
|
||||
custom-event-value="{{customEventValue::custom}}"
|
||||
custom-event-object-value="{{customEventObject.value::change}}">
|
||||
custom-event-object-value="{{customEventObject.value::change}}"
|
||||
computed-from-mixed-literals='{{computeFromLiterals(3, "foo", bool)}}'
|
||||
computed-from-pure-literals='{{computeFromLiterals( 3, "foo")}}'
|
||||
computed-from-tricky-literals="{{computeFromTrickyLiterals(3, 'tricky\,\'zot\'')}}"
|
||||
computed-from-tricky-literals2='{{computeFromTrickyLiterals(3,"tricky\,'zot'" )}}'
|
||||
computed-from-no-args="{{computeFromNoArgs( )}}"
|
||||
>
|
||||
Test
|
||||
</div>
|
||||
<span id="boundText">{{text}}</span>
|
||||
<span idtest id="{{boundId}}"></span>
|
||||
<s id="computedContent">{{computeFromTrickyLiterals(3, 'tricky\,\'zot\'')}}</s>
|
||||
</template>
|
||||
<script>
|
||||
Polymer({
|
||||
@@ -82,7 +89,7 @@
|
||||
}
|
||||
},
|
||||
observers: [
|
||||
'multipleDepChangeHandler(dep1 dep2 dep3)',
|
||||
'multipleDepChangeHandler(dep1, dep2, dep3)',
|
||||
'customEventObjectValueChanged(customEventObject.value)'
|
||||
],
|
||||
created: function() {
|
||||
@@ -184,6 +191,17 @@
|
||||
assert.equal(arguments.length, 1, 'observer argument length wrong');
|
||||
assert.equal(val, this.customEventObject.value, 'observer value argument wrong');
|
||||
// note, no `old` argument for path observers
|
||||
},
|
||||
computeFromLiterals: function(num, str) {
|
||||
assert.equal(num, 3);
|
||||
assert.equal(str, 'foo');
|
||||
return num + str;
|
||||
},
|
||||
computeFromTrickyLiterals: function(a, b) {
|
||||
return a + b;
|
||||
},
|
||||
computeFromNoArgs: function() {
|
||||
return 'no args!';
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
Reference in New Issue
Block a user