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

fix($rootScope): remove support for a watch listener to be a string #8190

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/ng/rootScope.js
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ function $RootScopeProvider(){
*
* - `string`: Evaluated as {@link guide/expression expression}
* - `function(scope)`: called with current `scope` as a parameter.
* @param {(function()|string)=} listener Callback called whenever the return value of
* @param {function()=} listener Callback called whenever the return value of
* the `watchExpression` changes.
*
* - `string`: Evaluated as {@link guide/expression expression}
Expand All @@ -340,10 +340,8 @@ function $RootScopeProvider(){

lastDirtyWatch = null;

// in the case user pass string, we need to compile it, do we really need this ?
if (!isFunction(listener)) {
var listenFn = compileToFn(listener || noop, 'listener');
watcher.fn = function(newVal, oldVal, scope) {listenFn(scope);};
watcher.fn = noop;
}

if (!array) {
Expand Down
4 changes: 3 additions & 1 deletion test/BinderSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,9 @@ describe('Binder', function() {
it('ItShouldFireChangeListenersBeforeUpdate', inject(function($rootScope, $compile) {
element = $compile('<div ng-bind="name"></div>')($rootScope);
$rootScope.name = '';
$rootScope.$watch('watched', 'name=123');
$rootScope.$watch('watched', function () {
$rootScope.name = 123;
});
$rootScope.watched = 'change';
$rootScope.$apply();
expect($rootScope.name).toBe(123);
Expand Down
4 changes: 3 additions & 1 deletion test/ng/rootScopeSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1143,7 +1143,9 @@ describe('Scope', function() {
it('should cause a $digest rerun', inject(function($rootScope) {
$rootScope.log = '';
$rootScope.value = 0;
$rootScope.$watch('value', 'log = log + ".";');
$rootScope.$watch('value', function () {
$rootScope.log = $rootScope.log + ".";
});
$rootScope.$watch('init', function() {
$rootScope.$evalAsync('value = 123; log = log + "=" ');
expect($rootScope.value).toEqual(0);
Expand Down