suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix displaying flashes coming from the server

Browse Source
This commit is contained in:
Piotr Sarnacki 2016-01-07 10:22:18 +01:00
parent 7649c180dd
commit bde3b7375a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/ajax.js
View File

@ -77,17 +77,17 @@ export default Ember.Service.extend({
options.contentType = options.contentType || 'application/json; charset=utf-8'; options.contentType = options.contentType || 'application/json; charset=utf-8';
} }
success = options.success || (function() {}); success = options.success || (function() {});
options.success = (body, status, xhr) => { options.success = (data, status, xhr) => {
if (data != null ? data.flash : void 0) { if (data != null ? data.flash : void 0) {
Travis.lookup('controller:flash').loadFlashes(data.flash); Travis.lookup('controller:flash').loadFlashes(data.flash);
} }
if (data != null) { if (data != null) {
delete data.flash; delete data.flash;
} }
return success.call(this, body, status, xhr); return success.call(this, data, status, xhr);
}; };
error = options.error || function() {}; error = options.error || function() {};
options.error = (body, status, xhr) => { options.error = (data, status, xhr) => {
console.log("[ERROR] API responded with an error (" + status + "): " + (JSON.stringify(data))); console.log("[ERROR] API responded with an error (" + status + "): " + (JSON.stringify(data)));
if (data != null ? data.flash : void 0) { if (data != null ? data.flash : void 0) {
Travis.lookup('controller:flash').pushObject(data.flash); Travis.lookup('controller:flash').pushObject(data.flash);
@ -95,7 +95,7 @@ export default Ember.Service.extend({
if (data != null) { if (data != null) {
delete data.flash; delete data.flash;
} }
return error.call(this, body, status, xhr); return error.call(this, data, status, xhr);
}; };
options = $.extend(options, default_options); options = $.extend(options, default_options);