aboutsummaryrefslogtreecommitdiffstats
path: root/scenario
diff options
context:
space:
mode:
authorMisko Hevery2010-10-26 15:35:58 -0700
committerMisko Hevery2010-10-26 16:33:59 -0700
commit9c0225512c63ebfc37e6408cc155d9da1fe682c9 (patch)
tree4973f6c57b801c71cbc93d7d993887ff6d3f9558 /scenario
parent40d7e66f408eaaa66efd8d7934ab2eb3324236a1 (diff)
downloadangular.js-9c0225512c63ebfc37e6408cc155d9da1fe682c9.tar.bz2
fixes IE related failures, and form submit event handling in ie
Diffstat (limited to 'scenario')
-rw-r--r--scenario/widgets-scenario.js12
-rw-r--r--scenario/widgets.html9
2 files changed, 16 insertions, 5 deletions
diff --git a/scenario/widgets-scenario.js b/scenario/widgets-scenario.js
index ba3ef3cf..7e8b8ade 100644
--- a/scenario/widgets-scenario.js
+++ b/scenario/widgets-scenario.js
@@ -27,12 +27,22 @@ describe('widgets', function() {
expect(binding('multiselect').fromJson()).toEqual(['A', 'C']);
expect(binding('button').fromJson()).toEqual({'count': 0});
+ expect(binding('form').fromJson()).toEqual({'count': 0});
+
element('form a').click();
expect(binding('button').fromJson()).toEqual({'count': 1});
- element('input[value="submit"]').click();
+
+ element('input[value="submit input"]').click();
+ expect(binding('button').fromJson()).toEqual({'count': 2});
+ expect(binding('form').fromJson()).toEqual({'count': 1});
+
+ element('button:contains("submit button")').click();
expect(binding('button').fromJson()).toEqual({'count': 2});
+ expect(binding('form').fromJson()).toEqual({'count': 2});
+
element('input[value="button"]').click();
expect(binding('button').fromJson()).toEqual({'count': 3});
+
element('input[type="image"]').click();
expect(binding('button').fromJson()).toEqual({'count': 4});
diff --git a/scenario/widgets.html b/scenario/widgets.html
index a520a326..adf2fa27 100644
--- a/scenario/widgets.html
+++ b/scenario/widgets.html
@@ -73,15 +73,16 @@
<tr><th colspan="3">Buttons</th></tr>
<tr>
<td>ng:change<br/>ng:click</td>
- <td ng:init="button.count = 0">
- <form>
+ <td ng:init="button.count = 0; form.count = 0;">
+ <form ng:submit="form.count = form.count + 1">
<input type="button" value="button" ng:change="button.count = button.count + 1"/> <br/>
- <input type="submit" value="submit" ng:change="button.count = button.count + 1"/><br/>
+ <input type="submit" value="submit input" ng:change="button.count = button.count + 1"/><br/>
+ <button type="submit">submit button</button>
<input type="image" src="" ng:change="button.count = button.count + 1"/><br/>
<a href="" ng:click="button.count = button.count + 1">action</a>
</form>
</td>
- <td>button={{button}}</td>
+ <td>button={{button}} form={{form}}</td>
</tr>
<tr><th colspan="3">Repeaters</th></tr>
<tr id="repeater-row">