Skip to content

Send Error instances to reject() #36

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

Open
joeyespo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Send Error instances to reject() #36

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
14 changes: 7 additions & 7 deletions dist/amd/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ define(
}
}
settings.success = makeSuccess(resolve);
settings.error = makeError(reject);
settings.error = makeError(settings, reject);
Ember.$.ajax(settings);
}, 'ic-ajax: ' + (settings.type || 'GET') + ' to ' + settings.url);
};
Expand Down Expand Up @@ -116,13 +116,13 @@ define(
}
}

function makeError(reject) {
function makeError(settings, reject) {
return function(jqXHR, textStatus, errorThrown) {
Ember.run(null, reject, {
jqXHR: jqXHR,
textStatus: textStatus,
errorThrown: errorThrown
});
var err = new Error((settings.type || 'GET') + ' ' + settings.url + ' ' + jqXHR.status + ' (' + errorThrown + ')');
err.jqXHR = jqXHR;
err.textStatus = textStatus;
err.errorThrown = errorThrown;
Ember.run(null, reject, err);
};
}
});
14 changes: 7 additions & 7 deletions dist/cjs/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ exports.lookupFixture = lookupFixture;function makePromise(settings) {
}
}
settings.success = makeSuccess(resolve);
settings.error = makeError(reject);
settings.error = makeError(settings, reject);
Ember.$.ajax(settings);
}, 'ic-ajax: ' + (settings.type || 'GET') + ' to ' + settings.url);
};
Expand Down Expand Up @@ -113,12 +113,12 @@ function makeSuccess(resolve) {
}
}

function makeError(reject) {
function makeError(settings, reject) {
return function(jqXHR, textStatus, errorThrown) {
Ember.run(null, reject, {
jqXHR: jqXHR,
textStatus: textStatus,
errorThrown: errorThrown
});
var err = new Error((settings.type || 'GET') + ' ' + settings.url + ' ' + jqXHR.status + ' (' + errorThrown + ')');
err.jqXHR = jqXHR;
err.textStatus = textStatus;
err.errorThrown = errorThrown;
Ember.run(null, reject, err);
};
}
14 changes: 7 additions & 7 deletions dist/globals/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ exports.lookupFixture = lookupFixture;function makePromise(settings) {
}
}
settings.success = makeSuccess(resolve);
settings.error = makeError(reject);
settings.error = makeError(settings, reject);
Ember.$.ajax(settings);
}, 'ic-ajax: ' + (settings.type || 'GET') + ' to ' + settings.url);
};
Expand Down Expand Up @@ -114,13 +114,13 @@ function makeSuccess(resolve) {
}
}

function makeError(reject) {
function makeError(settings, reject) {
return function(jqXHR, textStatus, errorThrown) {
Ember.run(null, reject, {
jqXHR: jqXHR,
textStatus: textStatus,
errorThrown: errorThrown
});
var err = new Error((settings.type || 'GET') + ' ' + settings.url + ' ' + jqXHR.status + ' (' + errorThrown + ')');
err.jqXHR = jqXHR;
err.textStatus = textStatus;
err.errorThrown = errorThrown;
Ember.run(null, reject, err);
};
}
},{}]},{},[1])
Expand Down
14 changes: 7 additions & 7 deletions dist/named-amd/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ define("ic-ajax",
}
}
settings.success = makeSuccess(resolve);
settings.error = makeError(reject);
settings.error = makeError(settings, reject);
Ember.$.ajax(settings);
}, 'ic-ajax: ' + (settings.type || 'GET') + ' to ' + settings.url);
};
Expand Down Expand Up @@ -116,13 +116,13 @@ define("ic-ajax",
}
}

function makeError(reject) {
function makeError(settings, reject) {
return function(jqXHR, textStatus, errorThrown) {
Ember.run(null, reject, {
jqXHR: jqXHR,
textStatus: textStatus,
errorThrown: errorThrown
});
var err = new Error((settings.type || 'GET') + ' ' + settings.url + ' ' + jqXHR.status + ' (' + errorThrown + ')');
err.jqXHR = jqXHR;
err.textStatus = textStatus;
err.errorThrown = errorThrown;
Ember.run(null, reject, err);
};
}
});
14 changes: 7 additions & 7 deletions lib/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function makePromise(settings) {
}
}
settings.success = makeSuccess(resolve);
settings.error = makeError(reject);
settings.error = makeError(settings, reject);
Ember.$.ajax(settings);
}, 'ic-ajax: ' + (settings.type || 'GET') + ' to ' + settings.url);
};
Expand Down Expand Up @@ -112,12 +112,12 @@ function makeSuccess(resolve) {
}
}

function makeError(reject) {
function makeError(settings, reject) {
return function(jqXHR, textStatus, errorThrown) {
Ember.run(null, reject, {
jqXHR: jqXHR,
textStatus: textStatus,
errorThrown: errorThrown
});
var err = new Error((settings.type || 'GET') + ' ' + settings.url + ' ' + jqXHR.status + ' (' + errorThrown + ')');
err.jqXHR = jqXHR;
err.textStatus = textStatus;
err.errorThrown = errorThrown;
Ember.run(null, reject, err);
};
}