This repository has been archived by the owner on Apr 12, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 27.5k
fix(rootScope): $watchCollection returns in oldCollection a copy of the ... #5688
Closed
gonzaloruizdevilla
wants to merge
1
commit into
angular:master
from
gonzaloruizdevilla:watchCollectionFix
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -572,6 +572,65 @@ describe('Scope', function() { | |
$rootScope.$digest(); | ||
expect(arrayLikelog).toEqual(['x', 'y']); | ||
}); | ||
|
||
it('should return a new array with old values', function(){ | ||
var watchArgs; | ||
$rootScope.$watchCollection('obj', function (newValues, oldValues) { | ||
watchArgs = { | ||
newValues: newValues, | ||
oldValues: oldValues | ||
}; | ||
}); | ||
|
||
$rootScope.obj = ['a']; | ||
$rootScope.$digest(); | ||
|
||
expect(watchArgs.newValues).toEqual($rootScope.obj); | ||
expect(watchArgs.oldValues).toEqual([]); | ||
|
||
$rootScope.obj.push('b'); | ||
$rootScope.$digest(); | ||
|
||
expect(watchArgs.newValues).toEqual(['a', 'b']); | ||
expect(watchArgs.oldValues).toEqual(['a']); | ||
}); | ||
|
||
it('should return a new array with old values from array like objects', function(){ | ||
var watchArgs; | ||
$rootScope.$watchCollection('arrayLikeObject', function (newValues, oldValues) { | ||
watchArgs = { | ||
newValues: [], | ||
oldValues: [] | ||
}; | ||
forEach(newValues, function (element){ | ||
watchArgs.newValues.push(element.name); | ||
}); | ||
forEach(oldValues, function (element){ | ||
watchArgs.oldValues.push(element.name); | ||
}); | ||
}); | ||
|
||
document.body.innerHTML = "<p>" + | ||
"<a name='x'>a</a>" + | ||
"<a name='y'>b</a>" + | ||
"<a name='z'>c</a>" + | ||
"</p>"; | ||
|
||
$rootScope.arrayLikeObject = document.getElementsByTagName('a'); | ||
$rootScope.$digest(); | ||
|
||
document.body.innerHTML = "<p>" + | ||
"<a name='x'>a</a>" + | ||
"<a name='y'>b</a>" + | ||
"</p>"; | ||
|
||
$rootScope.arrayLikeObject.length = 2; | ||
$rootScope.$digest(); | ||
|
||
expect(watchArgs.newValues).toEqual(['x', 'y']); | ||
expect(watchArgs.oldValues).toEqual(['x', 'y', 'z']); | ||
}); | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't see a test proving that we handle objects properly. are you omitting this on purpose? |
||
}); | ||
|
||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this should be:
or something along those lines. the important bit is listener.length - we don't want to compute this value if the listener is not asking for it. (we'll break the listener if it uses the
arguments
object to get hold of args, but I think it's a fair trade-off for hot code like this.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we also have a
slice
fn defined in Angular.js file, so you should use it