Skip to content

Commit

Permalink
Switch from Ember to ember-copy
Browse files Browse the repository at this point in the history
  • Loading branch information
wagenet committed Jun 15, 2018
1 parent e77cb7f commit dd82438
Show file tree
Hide file tree
Showing 4 changed files with 388 additions and 575 deletions.
4 changes: 2 additions & 2 deletions addon/animate.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* jshint newcap: false */
import Promise from "./promise";
import Ember from "ember";
import { copy } from 'ember-copy'
import Velocity from "velocity";

// Make sure Velocity always has promise support by injecting our own
Expand Down Expand Up @@ -28,7 +28,7 @@ export function animate(elt, props, opts, label) {
if (!opts) {
opts = {};
} else {
opts = Ember.copy(opts);
opts = copy(opts);
}

// By default, we ask velocity to clear the element's `display`
Expand Down
3 changes: 2 additions & 1 deletion addon/transitions/explode.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Ember from "ember";
import { copy } from 'ember-copy'
import { Promise } from "liquid-fire";

// Explode is not, by itself, an animation. It exists to pull apart
Expand Down Expand Up @@ -30,7 +31,7 @@ export default function explode(...pieces) {
}

function explodePiece(context, piece, seen) {
var childContext = Ember.copy(context);
var childContext = copy(context);
var selectors = [piece.pickOld || piece.pick, piece.pickNew || piece.pick];
var cleanupOld, cleanupNew;

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"broccoli-merge-trees": "^1.0.0",
"broccoli-stew": "^1.4.2",
"ember-cli-babel": "^6.3.0",
"ember-copy": "^1.0.0",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-version-checker": "^2.0.0",
"ember-getowner-polyfill": "^2.0.1",
Expand Down
Loading

0 comments on commit dd82438

Please sign in to comment.