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

fix(Angular): deprecate angular.merge #16036

Merged
merged 2 commits into from
Jun 12, 2017
Merged

fix(Angular): deprecate angular.merge #16036

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c073941
fix(Angular): deprecate angular.merge
Narretz Jun 6, 2017
5da1e23
fix typos
Narretz Jun 6, 2017
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
14 changes: 14 additions & 0 deletions src/Angular.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,20 @@ function extend(dst) {
* Unlike {@link angular.extend extend()}, `merge()` recursively descends into object properties of source
* objects, performing a deep copy.
*
* @deprecated
* sinceVersion="1.6.5"
* This function is deprecated, but will not be removed in the 1.x lifecycle.
* There are a edge cases (see {@link angular.merge#known-issues known issues}) that are not
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a edge cases known issues --> ???

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Get rid of the a I guess. Did you read over the (see known issues)?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, right. I missed (see 😃 So, just remove a then.

* supported by this function. We suggest
* using [lodash's merge()](https://lodash.com/docs/4.17.4#merge) instead.
*
* @knownIssue
* This is a list of (known) object types that cannot be / are incorrectly handled by this function:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The cannot be / are incorrectly doesn't read that well. I would split it up (e.g. cannot be handled or are handled incorrectly) or change it to cannot be correctly handled or something.

* - [`Blob`](https://developer.mozilla.org/docs/Web/API/Blob)
* - [`MediaStream`](https://developer.mozilla.org/docs/Web/API/MediaStream)
* - [`CanvasGradient`](https://developer.mozilla.org/docs/Web/API/CanvasGradient)
* - AngularJS {@link $rootScope.Scope scopes};
*
* @param {Object} dst Destination object.
* @param {...Object} src Source object(s).
* @returns {Object} Reference to `dst`.
Expand Down