Skip to content

Commit 9c06394

Browse files
mheverymhevery
committed
chore(scenario tests): make scenario tests pass again
1 parent 085e3c6 commit 9c06394

19 files changed

+156
-225
lines changed

‎docs/content/cookbook/advancedform.ngdoc‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,28 @@ detection, and preventing invalid form submission.
3434
save: function() {
3535
this.master = this.form;
3636
this.cancel();
37+
},
38+
39+
addContact: function() {
40+
this.form.contacts.push({type:'', value:''});
41+
},
42+
43+
removeContact: function(contact) {
44+
for ( var i = 0, ii = this.form.contacts.length; i < ii; i++) {
45+
if (contact === this.form.contacts[i]) {
46+
this.form.contacts.splice(i, 1);
47+
}
48+
}
49+
},
50+
51+
isCancelDisabled: function() {
52+
return angular.equals(this.master, this.form);
53+
},
54+
55+
isSaveDisabled: function() {
56+
return this.myForm.$invalid || angular.equals(this.master, this.form);
3757
}
58+
3859
};
3960
</script>
4061
<div ng:controller="UserForm">
@@ -53,7 +74,7 @@ detection, and preventing invalid form submission.
5374
ng:pattern="zip" required/><br/><br/>
5475

5576
<label>Contacts:</label>
56-
[ <a href="" ng:click="form.contacts.$add()">add</a> ]
77+
[ <a href="" ng:click="addContact()">add</a> ]
5778
<div ng:repeat="contact in form.contacts">
5879
<select ng:model="contact.type">
5980
<option>email</option>
@@ -62,10 +83,10 @@ detection, and preventing invalid form submission.
6283
<option>IM</option>
6384
</select>
6485
<input type="text" ng:model="contact.value" required/>
65-
[ <a href="" ng:click="form.contacts.$remove(contact)">X</a> ]
86+
[ <a href="" ng:click="removeContact(contact)">X</a> ]
6687
</div>
67-
<button ng:click="cancel()" ng:disabled="{{master.$equals(form)}}">Cancel</button>
68-
<button ng:click="save()" ng:disabled="{{myForm.$invalid || master.$equals(form)}}">Save</button>
88+
<button ng:click="cancel()" ng:disabled="{{isCancelDisabled()}}">Cancel</button>
89+
<button ng:click="save()" ng:disabled="{{isSaveDisabled()}}">Save</button>
6990
</form>
7091

7192
<hr/>

‎docs/content/cookbook/form.ngdoc‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,18 @@ allow a user to enter data.
1818
};
1919
this.state = /^\w\w$/;
2020
this.zip = /^\d\d\d\d\d$/;
21+
22+
this.addContact = function() {
23+
this.user.contacts.push({type:'', value:''});
24+
};
25+
26+
this.removeContact = function(contact) {
27+
for ( var i = 0, ii = this.user.contacts.length; i < ii; i++) {
28+
if (contact === this.user.contacts[i]) {
29+
this.user.contacts.splice(i, 1);
30+
}
31+
}
32+
};
2133
}
2234
</script>
2335
<div ng:controller="FormController" class="example">
@@ -34,7 +46,7 @@ allow a user to enter data.
3446
ng:pattern="zip" required><br/><br/>
3547

3648
<label>Phone:</label>
37-
[ <a href="" ng:click="user.contacts.$add()">add</a> ]
49+
[ <a href="" ng:click="addContact()">add</a> ]
3850
<div ng:repeat="contact in user.contacts">
3951
<select ng:model="contact.type">
4052
<option>email</option>
@@ -43,7 +55,7 @@ allow a user to enter data.
4355
<option>IM</option>
4456
</select>
4557
<input type="text" ng:model="contact.value" required/>
46-
[ <a href="" ng:click="user.contacts.$remove(contact)">X</a> ]
58+
[ <a href="" ng:click="removeContact(contact)">X</a> ]
4759
</div>
4860
<hr/>
4961
Debug View:

‎docs/content/guide/dev_guide.expressions.ngdoc‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,26 @@ You can try evaluating different expressions here:
5454
function Cntl2() {
5555
this.exprs = [];
5656
this.expr = '3*10|currency';
57+
this.addExp = function(expr) {
58+
this.exprs.push(expr);
59+
};
60+
61+
this.removeExp = function(contact) {
62+
for ( var i = 0, ii = this.exprs.length; i < ii; i++) {
63+
if (contact === this.exprs[i]) {
64+
this.exprs.splice(i, 1);
65+
}
66+
}
67+
};
5768
}
5869
</script>
5970
<div ng:controller="Cntl2" class="expressions">
6071
Expression:
6172
<input type='text' ng:model="expr" size="80"/>
62-
<button ng:click="exprs.$add(expr)">Evaluate</button>
73+
<button ng:click="addExp(expr)">Evaluate</button>
6374
<ul>
6475
<li ng:repeat="expr in exprs">
65-
[ <a href="" ng:click="exprs.$remove(expr)">X</a> ]
76+
[ <a href="" ng:click="removeExp(expr)">X</a> ]
6677
<tt>{{expr}}</tt> => <span ng:bind="$parent.$eval(expr)"></span>
6778
</li>
6879
</ul>
@@ -175,7 +186,7 @@ Extensions: You can further extend the expression vocabulary by adding new metho
175186
Search: <input ng:model="searchText"/>
176187
<table class="example3">
177188
<tr><th>Name</th><th>Phone</th><tr>
178-
<tr ng:repeat="friend in friends.$filter(searchText)">
189+
<tr ng:repeat="friend in friends | filter:searchText">
179190
<td>{{friend.name}}</td>
180191
<td>{{friend.phone}}</td>
181192
</tr>

‎docs/content/guide/dev_guide.forms.ngdoc‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,16 @@ The following example demonstrates:
134134
save: function() {
135135
this.master = this.form;
136136
this.cancel();
137+
},
138+
139+
isCancelDisabled: function() {
140+
return angular.equals(this.master, this.form);
141+
},
142+
143+
isSaveDisabled: function() {
144+
return this.userForm.$invalid || angular.equals(this.master, this.form);
137145
}
146+
138147
};
139148
</script>
140149
<div ng:controller="UserFormCntl">
@@ -172,10 +181,9 @@ The following example demonstrates:
172181
</ng:form>
173182

174183
<button ng:click="cancel()"
175-
ng:disabled="{{master.$equals(form)}}">Cancel</button>
184+
ng:disabled="{{isCancelDisabled()}}">Cancel</button>
176185
<button ng:click="save()"
177-
ng:disabled="{{userForm.$invalid || master.$equals(form)}}">
178-
Save</button>
186+
ng:disabled="{{isSaveDisabled()}}">Save</button>
179187
</form>
180188

181189
<hr/>
@@ -278,9 +286,9 @@ This example shows how to implement a custom HTML editor widget in Angular.
278286
this.htmlContent = '<b>Hello</b> <i>World</i>!';
279287
}
280288

281-
function HTMLEditorWidget(element) {
289+
HTMLEditorWidget.$inject = ['$element', 'html$Filter'];
290+
function HTMLEditorWidget(element, htmlFilter) {
282291
var self = this;
283-
var htmlFilter = angular.filter('html');
284292

285293
this.$parseModel = function() {
286294
// need to protect for script injection
@@ -309,7 +317,7 @@ This example shows how to implement a custom HTML editor widget in Angular.
309317
}
310318

311319
angular.directive('ng:html-editor-model', function() {
312-
function linkFn($formFactory, element) {
320+
return ['$formFactory', '$element', function ($formFactory, element) {
313321
var exp = element.attr('ng:html-editor-model'),
314322
form = $formFactory.forElement(element),
315323
widget;
@@ -318,15 +326,13 @@ This example shows how to implement a custom HTML editor widget in Angular.
318326
scope: this,
319327
model: exp,
320328
controller: HTMLEditorWidget,
321-
controllerArgs: [element]});
329+
controllerArgs: {$element: element}});
322330
// if the element is destroyed, then we need to
323331
// notify the form.
324332
element.bind('$destroy', function() {
325333
widget.$destroy();
326334
});
327-
}
328-
linkFn.$inject = ['$formFactory'];
329-
return linkFn;
335+
}];
330336
});
331337
</script>
332338
<form name='editorForm' ng:controller="EditorCntl">

‎docs/content/guide/dev_guide.services.injecting_controllers.ngdoc‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,18 @@ myController.$inject = ['$location', '$log'];
3131
<doc:example>
3232
<doc:source>
3333
<script type="text/javascript">
34-
angular.service('notify', function(win) {
35-
var msgs = [];
36-
return function(msg) {
37-
msgs.push(msg);
38-
if (msgs.length == 3) {
39-
win.alert(msgs.join("\n"));
40-
msgs = [];
41-
}
42-
};
43-
}, {$inject: ['$window']});
34+
angular.module.MyServiceModule = ['$provide', function($provide){
35+
$provide.factory('notify', ['$window', function(win) {
36+
var msgs = [];
37+
return function(msg) {
38+
msgs.push(msg);
39+
if (msgs.length == 3) {
40+
win.alert(msgs.join("\n"));
41+
msgs = [];
42+
}
43+
};
44+
}]);
45+
}];
4446

4547
function myController(notifyService) {
4648
this.callNotify = function(msg) {
@@ -51,7 +53,7 @@ function myController(notifyService) {
5153
myController.$inject = ['notify'];
5254
</script>
5355

54-
<div ng:controller="myController">
56+
<div ng:controller="myController" ng:module="MyServiceModule">
5557
<p>Let's try this simple notify service, injected into the controller...</p>
5658
<input ng:init="message='test'" type="text" ng:model="message" />
5759
<button ng:click="callNotify(message);">NOTIFY</button>

‎docs/content/guide/dev_guide.templates.filters.creating_filters.ngdoc‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,32 @@ text upper-case and assigns color.
1919
<doc:example>
2020
<doc:source>
2121
<script type="text/javascript">
22-
angular.filter('reverse', function(input, uppercase, color) {
23-
var out = "";
24-
for (var i = 0; i < input.length; i++) {
25-
out = input.charAt(i) + out;
22+
angular.module.MyReverseModule = function MyModule($provide) {
23+
$provide.filter('reverse', function() {
24+
return function(input, uppercase, color) {
25+
var out = "";
26+
for (var i = 0; i < input.length; i++) {
27+
out = input.charAt(i) + out;
28+
}
29+
// conditional based on optional argument
30+
if (uppercase) {
31+
out = out.toUpperCase();
32+
}
33+
// DOM manipulation using $element
34+
if (color) {
35+
this.$element.css('color', color);
36+
}
37+
return out;
2638
}
27-
// conditional based on optional argument
28-
if (uppercase) {
29-
out = out.toUpperCase();
30-
}
31-
// DOM manipulation using $element
32-
if (color) {
33-
this.$element.css('color', color);
34-
}
35-
return out;
3639
});
40+
}
3741

3842
function Ctrl() {
3943
this.greeting = 'hello';
4044
}
4145
</script>
4246

43-
<div ng:controller="Ctrl">
47+
<div ng:controller="Ctrl" ng:module="MyReverseModule">
4448
<input ng:model="greeting" type="greeting"><br>
4549
No filter: {{greeting}}<br>
4650
Reverse: {{greeting|reverse}}<br>

‎docs/src/templates/docs.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -474,3 +474,11 @@ td.empty-corner-lt {
474474
.error {
475475
color: red;
476476
}
477+
478+
.odd {
479+
background-color: #808080;
480+
}
481+
482+
.even {
483+
background-color: #d3d3d3;
484+
}

‎example/personalLog/personalLog.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
<hr/>
2121
<h2>Logs:</h2>
2222
<ul>
23-
<li ng:repeat="log in logs.$orderBy('-at')">
23+
<li ng:repeat="log in logs | orderBy:'-at'">
2424
{{log.at | date:'yy-MM-dd HH:mm'}} {{log.msg}}
2525
[<a href="" ng:click="rmLog(log)">x</a>]
2626
</li>
2727
</ul>
2828

2929
</body>
30-
</html>
30+
</html>

0 commit comments

Comments
 (0)