Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replace all uses of Ember.copy, Ember.merge w/ Object.assign #835

Merged
merged 1 commit into from
Jul 25, 2018
+4 −7
Merged

replace all uses of Ember.copy, Ember.merge w/ Object.assign #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions app/libs/promise-assembler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { assert } from '@ember/debug';
import { copy } from '@ember/object/internals';
import { later } from '@ember/runloop';
import EmberObject, { computed } from '@ember/object';
import EventedMixin from '@ember/object/evented';
Expand Down Expand Up @@ -68,7 +67,7 @@ export default EmberObject.extend(EventedMixin, {

rebuildPromises(promises) {
promises.forEach(props => {
props = copy(props);
props = Object.assign({}, props);
let childrenIds = props.children;
let parentId = props.parent;
delete props.children;
Expand Down
4 changes: 1 addition & 3 deletions app/libs/resizable-columns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
import { set } from '@ember/object';

import { isNone } from '@ember/utils';
import { copy } from '@ember/object/internals';
import { merge } from '@ember/polyfills';
import compareArrays from 'ember-inspector/utils/compare-arrays';

const { floor } = Math;
Expand Down Expand Up @@ -193,7 +191,7 @@ export default class {
if (this._columnVisibility) {
return this._columnVisibility;
}
this._columnVisibility = this.columnSchema.map(column => merge(copy(column), {
this._columnVisibility = this.columnSchema.map(column => Object.assign({}, column, {
visible: this.isColumnVisible(column.id)
}));
}
Expand Down
4 changes: 2 additions & 2 deletions ember_debug/libs/promise-assembler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Promise from 'ember-debug/models/promise';
const Ember = window.Ember;
const { Object: EmberObject, Evented, A, computed, RSVP, copy, isNone } = Ember;
const { Object: EmberObject, Evented, A, computed, RSVP, isNone } = Ember;

let PromiseAssembler = EmberObject.extend(Evented, {
// RSVP lib to debug
Expand Down Expand Up @@ -95,7 +95,7 @@ let PromiseAssembler = EmberObject.extend(Evented, {
if (entry) {
entry.setProperties(properties);
} else {
properties = copy(properties);
properties = Object.assign({}, properties);
properties.guid = guid;
entry = this.createPromise(properties);
}
Expand Down