diff --git a/src/Angular.js b/src/Angular.js index 4cb891a0401e..cbfbe0ffaecf 100644 --- a/src/Angular.js +++ b/src/Angular.js @@ -843,7 +843,7 @@ function arrayRemove(array, value) {
form = {{user | json}}
-
master = {{master | json}}
+
leader = {{leader | json}}
@@ -851,16 +851,16 @@ function arrayRemove(array, value) { angular. module('copyExample', []). controller('ExampleController', ['$scope', function($scope) { - $scope.master = {}; + $scope.leader = {}; $scope.reset = function() { // Example with 1 argument - $scope.user = angular.copy($scope.master); + $scope.user = angular.copy($scope.leader); }; $scope.update = function(user) { // Example with 2 arguments - angular.copy(user, $scope.master); + angular.copy(user, $scope.leader); }; $scope.reset(); diff --git a/src/ng/directive/attrs.js b/src/ng/directive/attrs.js index 3d5fd0a9d00f..af0bf14efd1f 100644 --- a/src/ng/directive/attrs.js +++ b/src/ng/directive/attrs.js @@ -205,14 +205,14 @@ * @example -
- +
+
it('should check both checkBoxes', function() { - expect(element(by.id('checkSlave')).getAttribute('checked')).toBeFalsy(); - element(by.model('master')).click(); - expect(element(by.id('checkSlave')).getAttribute('checked')).toBeTruthy(); + expect(element(by.id('checkFollower')).getAttribute('checked')).toBeFalsy(); + element(by.model('leader')).click(); + expect(element(by.id('checkFollower')).getAttribute('checked')).toBeTruthy(); });
diff --git a/test/jqLiteSpec.js b/test/jqLiteSpec.js index 141718b17340..60c9981e2429 100644 --- a/test/jqLiteSpec.js +++ b/test/jqLiteSpec.js @@ -1761,26 +1761,26 @@ describe('jqLite', function() { it('should deregister specific listener for multiple types separated by spaces', function() { var aElem = jqLite(a), - masterSpy = jasmine.createSpy('master'), + leaderSpy = jasmine.createSpy('leader'), extraSpy = jasmine.createSpy('extra'); - aElem.on('click', masterSpy); + aElem.on('click', leaderSpy); aElem.on('click', extraSpy); - aElem.on('mouseover', masterSpy); + aElem.on('mouseover', leaderSpy); browserTrigger(a, 'click'); browserTrigger(a, 'mouseover'); - expect(masterSpy).toHaveBeenCalledTimes(2); + expect(leaderSpy).toHaveBeenCalledTimes(2); expect(extraSpy).toHaveBeenCalledOnce(); - masterSpy.calls.reset(); + leaderSpy.calls.reset(); extraSpy.calls.reset(); - aElem.off('click mouseover', masterSpy); + aElem.off('click mouseover', leaderSpy); browserTrigger(a, 'click'); browserTrigger(a, 'mouseover'); - expect(masterSpy).not.toHaveBeenCalled(); + expect(leaderSpy).not.toHaveBeenCalled(); expect(extraSpy).toHaveBeenCalledOnce(); });