Skip to content

Commit e7b2a25

Browse files
committed
Merge pull request #4171 from HeroicEric/cleanup-backburner
[CLEANUP] Remove shim for Backburner.join
2 parents 29c36ed + c5219f6 commit e7b2a25

File tree

1 file changed

+1
-42
lines changed

1 file changed

+1
-42
lines changed

addon/-private/system/store.js

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -57,51 +57,10 @@ import isEnabled from 'ember-data/-private/features';
5757

5858
export let badIdFormatAssertion = '`id` has to be non-empty string or number';
5959

60-
var Backburner = Ember._Backburner || Ember.Backburner || Ember.__loader.require('backburner')['default'] || Ember.__loader.require('backburner')['Backburner'];
60+
const Backburner = Ember._Backburner;
6161
var Map = Ember.Map;
6262
var isArray = Array.isArray || Ember.isArray;
6363

64-
//Shim Backburner.join
65-
if (!Backburner.prototype.join) {
66-
var isString = function(suspect) {
67-
return typeof suspect === 'string';
68-
};
69-
70-
Backburner.prototype.join = function(/*target, method, args */) {
71-
var method, target;
72-
73-
if (this.currentInstance) {
74-
var length = arguments.length;
75-
if (length === 1) {
76-
method = arguments[0];
77-
target = null;
78-
} else {
79-
target = arguments[0];
80-
method = arguments[1];
81-
}
82-
83-
if (isString(method)) {
84-
method = target[method];
85-
}
86-
87-
if (length === 1) {
88-
return method();
89-
} else if (length === 2) {
90-
return method.call(target);
91-
} else {
92-
var args = new Array(length - 2);
93-
for (var i = 0; i < args.length; i++) {
94-
args[i] = arguments[i + 2];
95-
}
96-
return method.apply(target, args);
97-
}
98-
} else {
99-
return this.run.apply(this, arguments);
100-
}
101-
};
102-
}
103-
104-
10564
//Get the materialized model from the internalModel/promise that returns
10665
//an internal model and return it in a promiseObject. Useful for returning
10766
//from find methods

0 commit comments

Comments
 (0)