Skip to content

Commit ca30fce

Browse files
shyamseshadrimhevery
shyamseshadri
authored and
mhevery
committed
fix(*): name all anonymous watch functions in Angular
This will allow us to see function names in Batarang and debugger. Closes angular#1119
1 parent b6e4a71 commit ca30fce

17 files changed

+31
-30
lines changed

Diff for: ‎docs/src/templates/js/docs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ docsApp.controller.DocsController = function($scope, $location, $window, $cookie
297297
tutorial: 'Tutorial',
298298
cookbook: 'Examples'
299299
};
300-
$scope.$watch(function() {return $location.path(); }, function(path) {
300+
$scope.$watch(function docsPathWatch() {return $location.path(); }, function docsPathWatchAction(path) {
301301
// ignore non-doc links which are used in examples
302302
if (DOCS_PATH.test(path)) {
303303
var parts = path.split('/'),

Diff for: ‎src/bootstrap/bootstrap-prettify.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ directive.ngEmbedApp = ['$templateCache', '$browser', '$rootScope', '$location',
210210
}, $delegate);
211211
}]);
212212
$provide.decorator('$rootScope', ['$delegate', function(embedRootScope) {
213-
docsRootScope.$watch(function() {
213+
docsRootScope.$watch(function embedRootScopeDigestWatch() {
214214
embedRootScope.$digest();
215215
});
216216
return embedRootScope;

Diff for: ‎src/bootstrap/bootstrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ directive.dropdownToggle =
99
return {
1010
restrict: 'C',
1111
link: function(scope, element, attrs) {
12-
scope.$watch(function(){return $location.path();}, function() {
12+
scope.$watch(function dropdownTogglePathWatch(){return $location.path();}, function dropdownTogglePathWatchAction() {
1313
close && close();
1414
});
1515

Diff for: ‎src/ng/anchorScroll.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ function $AnchorScrollProvider() {
5555
// does not scroll when user clicks on anchor link that is currently on
5656
// (no url change, no $locaiton.hash() change), browser native does scroll
5757
if (autoScrollingEnabled) {
58-
$rootScope.$watch(function() {return $location.hash();}, function() {
59-
$rootScope.$evalAsync(scroll);
60-
});
58+
$rootScope.$watch(function autoScrollWatch() {return $location.hash();},
59+
function autoScrollWatchAction() {
60+
$rootScope.$evalAsync(scroll);
61+
});
6162
}
6263

6364
return scroll;

Diff for: ‎src/ng/compile.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ function $CompileProvider($provide) {
737737
' (directive: ' + newScopeDirective.name + ')');
738738
};
739739
lastValue = scope[scopeName] = parentGet(parentScope);
740-
scope.$watch(function() {
740+
scope.$watch(function parentValueWatch() {
741741
var parentValue = parentGet(parentScope);
742742

743743
if (parentValue !== scope[scopeName]) {
@@ -996,7 +996,7 @@ function $CompileProvider($provide) {
996996
bindings = parent.data('$binding') || [];
997997
bindings.push(interpolateFn);
998998
safeAddClass(parent.data('$binding', bindings), 'ng-binding');
999-
scope.$watch(interpolateFn, function(value) {
999+
scope.$watch(interpolateFn, function interpolateFnWatchAction(value) {
10001000
node[0].nodeValue = value;
10011001
});
10021002
})
@@ -1026,7 +1026,7 @@ function $CompileProvider($provide) {
10261026
attr[name] = undefined;
10271027
($$observers[name] || ($$observers[name] = [])).$$inter = true;
10281028
(attr.$$observers && attr.$$observers[name].$$scope || scope).
1029-
$watch(interpolateFn, function(value) {
1029+
$watch(interpolateFn, function interpolateFnWatchAction(value) {
10301030
attr.$set(name, value);
10311031
});
10321032
})

Diff for: ‎src/ng/directive/booleanAttrs.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ forEach(BOOLEAN_ATTR, function(propName, attrName) {
284284
priority: 100,
285285
compile: function() {
286286
return function(scope, element, attr) {
287-
scope.$watch(attr[normalized], function(value) {
287+
scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) {
288288
attr.$set(attrName, !!value);
289289
});
290290
};

Diff for: ‎src/ng/directive/input.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,7 @@ var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$
10101010

10111011
// model -> value
10121012
var ctrl = this;
1013-
$scope.$watch(ngModelGet, function(value) {
1013+
$scope.$watch(ngModelGet, function ngModelWatchAction(value) {
10141014

10151015
// ignore change from view
10161016
if (ctrl.$modelValue === value) return;
@@ -1257,7 +1257,7 @@ var ngValueDirective = function() {
12571257
};
12581258
} else {
12591259
return function(scope, elm, attr) {
1260-
scope.$watch(attr.ngValue, function(value) {
1260+
scope.$watch(attr.ngValue, function valueWatchAction(value) {
12611261
attr.$set('value', value, false);
12621262
});
12631263
};

Diff for: ‎src/ng/directive/ngBind.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
*/
5050
var ngBindDirective = ngDirective(function(scope, element, attr) {
5151
element.addClass('ng-binding').data('$binding', attr.ngBind);
52-
scope.$watch(attr.ngBind, function(value) {
52+
scope.$watch(attr.ngBind, function ngBindWatchAction(value) {
5353
element.text(value == undefined ? '' : value);
5454
});
5555
});
@@ -132,7 +132,7 @@ var ngBindTemplateDirective = ['$interpolate', function($interpolate) {
132132
var ngBindHtmlUnsafeDirective = [function() {
133133
return function(scope, element, attr) {
134134
element.addClass('ng-binding').data('$binding', attr.ngBindHtmlUnsafe);
135-
scope.$watch(attr.ngBindHtmlUnsafe, function(value) {
135+
scope.$watch(attr.ngBindHtmlUnsafe, function ngBindHtmlUnsafeWatchAction(value) {
136136
element.html(value || '');
137137
});
138138
};

Diff for: ‎src/ng/directive/ngClass.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function classDirective(name, selector) {
44
name = 'ngClass' + name;
55
return ngDirective(function(scope, element, attr) {
66
// Reusable function for re-applying the ngClass
7-
function reapply(newVal, oldVal) {
7+
function ngClassWatchAction(newVal, oldVal) {
88
if (selector === true || scope.$index % 2 === selector) {
99
if (oldVal && (newVal !== oldVal)) {
1010
if (isObject(oldVal) && !isArray(oldVal))
@@ -16,11 +16,11 @@ function classDirective(name, selector) {
1616
if (newVal) element.addClass(isArray(newVal) ? newVal.join(' ') : newVal);
1717
}
1818
};
19-
scope.$watch(attr[name], reapply, true);
19+
scope.$watch(attr[name], ngClassWatchAction, true);
2020

2121
attr.$observe('class', function(value) {
2222
var ngClass = scope.$eval(attr[name]);
23-
reapply(ngClass, ngClass);
23+
ngClassWatchAction(ngClass, ngClass);
2424
});
2525
});
2626
}

Diff for: ‎src/ng/directive/ngInclude.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ var ngIncludeDirective = ['$http', '$templateCache', '$anchorScroll', '$compile'
101101
element.html('');
102102
};
103103

104-
scope.$watch(srcExp, function(src) {
104+
scope.$watch(srcExp, function ngIncludeWatchAction(src) {
105105
var thisChangeId = ++changeCounter;
106106

107107
if (src) {

Diff for: ‎src/ng/directive/ngPluralize.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ var ngPluralizeDirective = ['$locale', '$interpolate', function($locale, $interp
188188
offset + endSymbol));
189189
});
190190

191-
scope.$watch(function() {
191+
scope.$watch(function ngPluralizeWatch() {
192192
var value = parseFloat(scope.$eval(numberExp));
193193

194194
if (!isNaN(value)) {
@@ -199,7 +199,7 @@ var ngPluralizeDirective = ['$locale', '$interpolate', function($locale, $interp
199199
} else {
200200
return '';
201201
}
202-
}, function(newVal) {
202+
}, function ngPluralizeWatchAction(newVal) {
203203
element.text(newVal);
204204
});
205205
}

Diff for: ‎src/ng/directive/ngRepeat.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ var ngRepeatDirective = ngDirective({
8989
// We expect this to be a rare case.
9090
var lastOrder = new HashQueueMap();
9191
var indexValues = [];
92-
scope.$watch(function(scope){
92+
scope.$watch(function ngRepeatWatch(scope){
9393
var index, length,
9494
collection = scope.$eval(rhs),
9595
collectionLength = size(collection, true),
@@ -131,7 +131,7 @@ var ngRepeatDirective = ngDirective({
131131
} else {
132132
last = undefined;
133133
}
134-
134+
135135
if (last) {
136136
// if we have already seen this object, then we need to reuse the
137137
// associated scope/element
@@ -187,7 +187,7 @@ var ngRepeatDirective = ngDirective({
187187
for (i = 0, l = indexValues.length - length; i < l; i++) {
188188
indexValues.pop();
189189
}
190-
190+
191191
//shrink children
192192
for (key in lastOrder) {
193193
if (lastOrder.hasOwnProperty(key)) {

Diff for: ‎src/ng/directive/ngShowHide.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*/
3535
//TODO(misko): refactor to remove element from the DOM
3636
var ngShowDirective = ngDirective(function(scope, element, attr){
37-
scope.$watch(attr.ngShow, function(value){
37+
scope.$watch(attr.ngShow, function ngShowWatchAction(value){
3838
element.css('display', toBoolean(value) ? '' : 'none');
3939
});
4040
});
@@ -74,7 +74,7 @@ var ngShowDirective = ngDirective(function(scope, element, attr){
7474
*/
7575
//TODO(misko): refactor to remove element from the DOM
7676
var ngHideDirective = ngDirective(function(scope, element, attr){
77-
scope.$watch(attr.ngHide, function(value){
77+
scope.$watch(attr.ngHide, function ngHideWatchAction(value){
7878
element.css('display', toBoolean(value) ? 'none' : '');
7979
});
8080
});

Diff for: ‎src/ng/directive/ngStyle.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</example>
3939
*/
4040
var ngStyleDirective = ngDirective(function(scope, element, attr) {
41-
scope.$watch(attr.ngStyle, function(newStyles, oldStyles) {
41+
scope.$watch(attr.ngStyle, function ngStyleWatchAction(newStyles, oldStyles) {
4242
if (oldStyles && (newStyles !== oldStyles)) {
4343
forEach(oldStyles, function(val, style) { element.css(style, '');});
4444
}

Diff for: ‎src/ng/directive/ngSwitch.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ var ngSwitchDirective = valueFn({
7272
selectedElement,
7373
selectedScope;
7474

75-
scope.$watch(watchExpr, function(value) {
75+
scope.$watch(watchExpr, function ngSwitchWatchAction(value) {
7676
if (selectedElement) {
7777
selectedScope.$destroy();
7878
selectedElement.remove();

Diff for: ‎src/ng/directive/select.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ var selectDirective = ['$compile', '$parse', function($compile, $parse) {
269269

270270
// we have to do it on each watch since ngModel watches reference, but
271271
// we need to work of an array, so we need to see if anything was inserted/removed
272-
scope.$watch(function() {
272+
scope.$watch(function selectMultipleWatch() {
273273
if (!equals(lastView, ctrl.$viewValue)) {
274274
lastView = copy(ctrl.$viewValue);
275275
ctrl.$render();
@@ -544,7 +544,7 @@ var optionDirective = ['$interpolate', function($interpolate) {
544544
}
545545

546546
if (interpolateFn) {
547-
scope.$watch(interpolateFn, function(newVal, oldVal) {
547+
scope.$watch(interpolateFn, function interpolateWatchAction(newVal, oldVal) {
548548
attr.$set('value', newVal);
549549
if (newVal !== oldVal) selectCtrl.removeOption(oldVal);
550550
selectCtrl.addOption(newVal);

Diff for: ‎src/ngSanitize/directive/ngBindHtml.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
angular.module('ngSanitize').directive('ngBindHtml', ['$sanitize', function($sanitize) {
1818
return function(scope, element, attr) {
1919
element.addClass('ng-binding').data('$binding', attr.ngBindHtml);
20-
scope.$watch(attr.ngBindHtml, function(value) {
20+
scope.$watch(attr.ngBindHtml, function ngBindHtmlWatchAction(value) {
2121
value = $sanitize(value);
2222
element.html(value || '');
2323
});

0 commit comments

Comments
 (0)