From fa96dd561281bb16ecc85a26ece2a446f35bb2e0 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 8 Sep 2017 19:55:27 +0200 Subject: [PATCH] made logger global --- Controller.js | 2 +- Models/Upload.js | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Controller.js b/Controller.js index c7cc660..ca65d4f 100644 --- a/Controller.js +++ b/Controller.js @@ -35,7 +35,7 @@ this.app.uiManager.getFormManager().get(form.id).injectSubmit(function (e, requestId, requestGroup) { let fileFields = e.querySelectorAll('input[type=file]'), - uploader = new jsOMS.Modules.Models.Media.Upload(self.app.responseManager, self.app.logger); + uploader = new jsOMS.Modules.Models.Media.Upload(self.app.responseManager); uploader.setSuccess(e.id, function (type, response) { diff --git a/Models/Upload.js b/Models/Upload.js index ee11ce2..663e941 100644 --- a/Models/Upload.js +++ b/Models/Upload.js @@ -4,9 +4,8 @@ jsOMS.Autoloader.defineNamespace('jsOMS.Modules.Models.Media'); - jsOMS.Modules.Models.Media.Upload = function (responseManager, logger) + jsOMS.Modules.Models.Media.Upload = function (responseManager) { - this.logger = logger; this.responseManager = responseManager; this.success = []; @@ -93,9 +92,9 @@ self.success[formId](response[k].type, response[k]); } } - } catch (exception) { - console.log(exception); - self.logger.error('Invalid media upload response: ' + xhr.response); + } catch (e) { + jsOMS.Log.Logger.instance.error(e); + jsOMS.Log.Logger.instance.error('Invalid media upload response: ' + xhr.response); return false; }