Skip to content
This repository was archived by the owner on Jul 29, 2024. It is now read-only.

Commit 40a9983

Browse files
committed
Allow '.' in ngModel names. Closes #7.
1 parent f701614 commit 40a9983

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

protractor.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ clientSideScripts.findInput = function() {
197197
var model = arguments[0];
198198
var prefixes = ['ng-', 'ng_', 'data-ng-', 'x-ng-', 'ng\\:'];
199199
for (var p = 0; p < prefixes.length; ++p) {
200-
var selector = 'input[' + prefixes[p] + 'model=' + model + ']';
200+
var selector = 'input[' + prefixes[p] + 'model="' + model + '"]';
201201
var inputs = document.querySelectorAll(selector);
202202
if (inputs.length) {
203203
return inputs[0];
@@ -216,7 +216,7 @@ clientSideScripts.findSelect = function() {
216216
var model = arguments[0];
217217
var prefixes = ['ng-', 'ng_', 'data-ng-', 'x-ng-', 'ng\\:'];
218218
for (var p = 0; p < prefixes.length; ++p) {
219-
var selector = 'select[' + prefixes[p] + 'model=' + model + ']';
219+
var selector = 'select[' + prefixes[p] + 'model="' + model + '"]';
220220
var inputs = document.querySelectorAll(selector);
221221
if (inputs.length) {
222222
return inputs[0];
@@ -236,7 +236,7 @@ clientSideScripts.findSelectedOption = function() {
236236
var prefixes = ['ng-', 'ng_', 'data-ng-', 'x-ng-', 'ng\\:'];
237237
for (var p = 0; p < prefixes.length; ++p) {
238238
var selector =
239-
'select[' + prefixes[p] + 'model=' + model + '] option:checked';
239+
'select[' + prefixes[p] + 'model="' + model + '"] option:checked';
240240
var inputs = document.querySelectorAll(selector);
241241
if (inputs.length) {
242242
return inputs[0];

spec/testAppSpec.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,22 +95,22 @@ describe('test application', function() {
9595
expect(text).toBe('');
9696
});
9797

98-
ptor.findElement(protractor.By.input('xcheck')).click();
98+
ptor.findElement(protractor.By.input('check.w')).click();
9999
letterList.getText().then(function(text) {
100-
expect(text).toBe('x');
100+
expect(text).toBe('w');
101101
});
102102

103-
ptor.findElement(protractor.By.input('ycheck')).click();
103+
ptor.findElement(protractor.By.input('check.x')).click();
104104
letterList.getText().then(function(text) {
105-
expect(text).toBe('xy');
105+
expect(text).toBe('wx');
106106
});
107107

108-
ptor.findElement(protractor.By.input('wcheck')).click();
108+
ptor.findElement(protractor.By.input('check.y')).click();
109109
letterList.getText().then(function(text) {
110110
expect(text).toBe('wxy');
111111
});
112112

113-
ptor.findElement(protractor.By.input('zcheck')).click();
113+
ptor.findElement(protractor.By.input('check.z')).click();
114114
letterList.getText().then(function(text) {
115115
expect(text).toBe('wxyz');
116116
done();

testapp/app/partials/form.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
<span id="shower" ng-show="show">Shown!!</span>
1313
</div>
1414

15-
<input data-ng-model="wcheck" ng-true-value="w" type="checkbox"/> W
16-
<input data-ng-model="xcheck" ng-true-value="x" type="checkbox"/> X
17-
<input x-ng-model="ycheck" ng-true-value="y" type="checkbox"/> Y
18-
<input ng_model="zcheck" ng-true-value="z" type="checkbox"/> Z
19-
<span id="letterlist">{{wcheck}}{{xcheck}}{{ycheck}}{{zcheck}}</span>
15+
<input ng:model="check.w" ng-true-value="w" type="checkbox"/> W
16+
<input data-ng-model="check.x" ng-true-value="x" type="checkbox"/> X
17+
<input x-ng-model="check.y" ng-true-value="y" type="checkbox"/> Y
18+
<input ng_model="check.z" ng-true-value="z" type="checkbox"/> Z
19+
<span id="letterlist">{{check.w}}{{check.x}}{{check.y}}{{check.z}}</span>
2020

2121
<ul><li ng-repeat="baz in days | filter:'T'">{{baz}}</li></ul>
2222
<ul><li data-ng-repeat="day in days">{{day}}</li></ul>

0 commit comments

Comments
 (0)