Skip to content

Commit

Permalink
[DOC release] Mark Ember.merge as public
Browse files Browse the repository at this point in the history
There are no alternative way to `Ember.merge` in Ember world.
But it is useful and widely used from other library.

For example:
* Ember Data: https://github.com/emberjs/data/blob/v1.13.7/packages/ember-data/lib/core.js#L29
* Liquid Fire: https://github.com/ef4/liquid-fire/blob/v0.21.0/app/transitions/scroll-then.js#L19

So this method may be public until `Object.assign` can be used natively.
  • Loading branch information
tricknotes committed Aug 4, 2015
1 parent e02159e commit 1c79810
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion packages/ember-metal/lib/merge.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@param {Object} original The object to merge into
@param {Object} updates The object to copy properties from
@return {Object}
@private
@public
*/
export default function merge(original, updates) {
if (!updates || typeof updates !== 'object') {
Expand Down

0 comments on commit 1c79810

Please sign in to comment.