From 737685a7c0e6cd3877ec7242cdef5f012a580091 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 29 Dec 2015 12:49:18 +0100 Subject: [PATCH] Fix ajax callbacks after javascript conversion --- app/components/log-content.js | 2 +- app/services/ajax.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/components/log-content.js b/app/components/log-content.js index afda0566..14110bc4 100644 --- a/app/components/log-content.js +++ b/app/components/log-content.js @@ -212,7 +212,7 @@ export default Ember.Component.extend({ toggleTailing() { Travis.tailing.toggle(); this.engine.autoCloseFold = !Travis.tailing.isActive(); - return event.preventDefault(); + return false; }, removeLogPopup() { diff --git a/app/services/ajax.js b/app/services/ajax.js index 3f9f8e34..8885e240 100644 --- a/app/services/ajax.js +++ b/app/services/ajax.js @@ -77,17 +77,17 @@ export default Ember.Service.extend({ options.contentType = options.contentType || 'application/json; charset=utf-8'; } success = options.success || (function() {}); - options.success = () => { + options.success = (body, status, xhr) => { if (data != null ? data.flash : void 0) { Travis.lookup('controller:flash').loadFlashes(data.flash); } if (data != null) { delete data.flash; } - return success.apply(this, arguments); + return success.call(this, body, status, xhr); }; error = options.error || function() {}; - options.error = () => { + options.error = (body, status, xhr) => { console.log("[ERROR] API responded with an error (" + status + "): " + (JSON.stringify(data))); if (data != null ? data.flash : void 0) { Travis.lookup('controller:flash').pushObject(data.flash); @@ -95,7 +95,7 @@ export default Ember.Service.extend({ if (data != null) { delete data.flash; } - return error.apply(this, arguments); + return error.call(this, body, status, xhr); }; options = $.extend(options, default_options);