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

Commit 3651e42

Browse files
frederikprijckpetebacondarwin
authored andcommitted
docs(*): replace master/slave with leader/follower
Previously, the docs made use of `master/slave`, which is offensive. This commit removes the usage of these terms and replace them with `leader/follower`.
1 parent 233a93f commit 3651e42

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/Angular.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -843,24 +843,24 @@ function arrayRemove(array, value) {
843843
<button ng-click="update(user)">SAVE</button>
844844
</form>
845845
<pre>form = {{user | json}}</pre>
846-
<pre>master = {{master | json}}</pre>
846+
<pre>leader = {{leader | json}}</pre>
847847
</div>
848848
</file>
849849
<file name="script.js">
850850
// Module: copyExample
851851
angular.
852852
module('copyExample', []).
853853
controller('ExampleController', ['$scope', function($scope) {
854-
$scope.master = {};
854+
$scope.leader = {};
855855
856856
$scope.reset = function() {
857857
// Example with 1 argument
858-
$scope.user = angular.copy($scope.master);
858+
$scope.user = angular.copy($scope.leader);
859859
};
860860
861861
$scope.update = function(user) {
862862
// Example with 2 arguments
863-
angular.copy(user, $scope.master);
863+
angular.copy(user, $scope.leader);
864864
};
865865
866866
$scope.reset();

src/ng/directive/attrs.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -205,14 +205,14 @@
205205
* @example
206206
<example name="ng-checked">
207207
<file name="index.html">
208-
<label>Check me to check both: <input type="checkbox" ng-model="master"></label><br/>
209-
<input id="checkSlave" type="checkbox" ng-checked="master" aria-label="Slave input">
208+
<label>Check me to check both: <input type="checkbox" ng-model="leader"></label><br/>
209+
<input id="checkFollower" type="checkbox" ng-checked="leader" aria-label="Follower input">
210210
</file>
211211
<file name="protractor.js" type="protractor">
212212
it('should check both checkBoxes', function() {
213-
expect(element(by.id('checkSlave')).getAttribute('checked')).toBeFalsy();
214-
element(by.model('master')).click();
215-
expect(element(by.id('checkSlave')).getAttribute('checked')).toBeTruthy();
213+
expect(element(by.id('checkFollower')).getAttribute('checked')).toBeFalsy();
214+
element(by.model('leader')).click();
215+
expect(element(by.id('checkFollower')).getAttribute('checked')).toBeTruthy();
216216
});
217217
</file>
218218
</example>

test/jqLiteSpec.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1761,26 +1761,26 @@ describe('jqLite', function() {
17611761

17621762
it('should deregister specific listener for multiple types separated by spaces', function() {
17631763
var aElem = jqLite(a),
1764-
masterSpy = jasmine.createSpy('master'),
1764+
leaderSpy = jasmine.createSpy('leader'),
17651765
extraSpy = jasmine.createSpy('extra');
17661766

1767-
aElem.on('click', masterSpy);
1767+
aElem.on('click', leaderSpy);
17681768
aElem.on('click', extraSpy);
1769-
aElem.on('mouseover', masterSpy);
1769+
aElem.on('mouseover', leaderSpy);
17701770

17711771
browserTrigger(a, 'click');
17721772
browserTrigger(a, 'mouseover');
1773-
expect(masterSpy).toHaveBeenCalledTimes(2);
1773+
expect(leaderSpy).toHaveBeenCalledTimes(2);
17741774
expect(extraSpy).toHaveBeenCalledOnce();
17751775

1776-
masterSpy.calls.reset();
1776+
leaderSpy.calls.reset();
17771777
extraSpy.calls.reset();
17781778

1779-
aElem.off('click mouseover', masterSpy);
1779+
aElem.off('click mouseover', leaderSpy);
17801780

17811781
browserTrigger(a, 'click');
17821782
browserTrigger(a, 'mouseover');
1783-
expect(masterSpy).not.toHaveBeenCalled();
1783+
expect(leaderSpy).not.toHaveBeenCalled();
17841784
expect(extraSpy).toHaveBeenCalledOnce();
17851785
});
17861786

0 commit comments

Comments
 (0)