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

Ember upgrade to 3.26 #184

Merged
merged 23 commits into from
Apr 1, 2021
Merged

Ember upgrade to 3.26 #184

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
61212b6
Use send instead of sendAction
RobbieTheWagner Jan 4, 2021
55d2ef6
Call directly instead of sending
RobbieTheWagner Jan 4, 2021
bc1c011
Fix tests
RobbieTheWagner Jan 4, 2021
7ee5f46
Fix Ember 3.26 deprecations
boris-petrov Mar 23, 2021
3177024
Remove an implicit injection
boris-petrov Mar 23, 2021
ce66abb
Merge of ember-cli-update
dgavey Mar 28, 2021
deeba1d
fix for bad merge on router
dgavey Mar 28, 2021
b975fca
Merge pull request #183 from boris-petrov/remove-implicit-injection
dgavey Mar 28, 2021
6e9bc33
Merge pull request #182 from boris-petrov/fix-ember-3.26-deprecations
dgavey Mar 28, 2021
e5fbeaa
Merge pull request #180 from rwwagner90/master
dgavey Mar 28, 2021
bac3bf8
Updated dummy app and templates to octane style
dgavey Mar 31, 2021
89c24a3
Modernize test templates
dgavey Mar 31, 2021
0ac393a
Modernize component templates
dgavey Mar 31, 2021
b1f4934
Update to yarn
dgavey Mar 31, 2021
781fb4b
Update travs.yml
dgavey Mar 31, 2021
b81f51d
more travs fixes
dgavey Mar 31, 2021
0ad00bb
Update ember try
dgavey Mar 31, 2021
ae3470f
Another travis update
dgavey Mar 31, 2021
0fe067f
Temp travis fix
dgavey Mar 31, 2021
b8a9be9
Tray drop in replacement for travis.yml
dgavey Mar 31, 2021
812c11b
Update readme and remove yarn lint in travis
dgavey Mar 31, 2021
0fd2671
add 3.12 for testing
dgavey Mar 31, 2021
44f5bd4
Fix readme
dgavey Mar 31, 2021
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
22 changes: 20 additions & 2 deletions app/models/coordinator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,29 @@ export default EmberObject.extend(Evented, {
var payload = this.get('objectMap').getObj(id);

if (payload.ops.source && !payload.ops.source.isDestroying && !payload.ops.source.isDestroyed) {
payload.ops.source.sendAction('action',payload.obj);
const action = payload.ops.source['action'];
// Support when action is a function
if (typeof action === 'function') {
action(payload.obj)
}

// Support when action is a string
if (typeof action === 'string' && typeof payload.ops.source.target[action] === 'function') {
payload.ops.source.target[action](payload.obj);
}
}

if (payload.ops.target && !payload.ops.target.isDestroying && !payload.ops.target.isDestroyed) {
payload.ops.target.sendAction('action',payload.obj);
const action = payload.ops.target['action'];
// Support when action is a function
if (typeof action === 'function') {
action(payload.obj)
}

// Support when action is a string
if (typeof action === 'string' && typeof payload.ops.target.source[action] === 'function') {
payload.ops.target.source[action](payload.obj);
}
}

this.trigger("objectMoved", {obj: unwrapper(payload.obj), source: payload.ops.source, target: ops.target});
Expand Down
Loading