From 7f820bfa807bfb3c374c096ed1dfd0ddf1dda751 Mon Sep 17 00:00:00 2001 From: Rob Garrison Date: Mon, 19 Nov 2018 20:53:13 -0600 Subject: [PATCH] Move error.message check --- manage/updater-ui.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/manage/updater-ui.js b/manage/updater-ui.js index 7fb07718..5141969b 100644 --- a/manage/updater-ui.js +++ b/manage/updater-ui.js @@ -127,10 +127,6 @@ function reportUpdateState({updated, style, error, STATES}) { ['no-update', 0], ['update-problem', 0], ]); - if (typeof error === 'object' && error.message) { - // UserCSS meta errors provide an object - error = error.message; - } if (updated) { newClasses.set('can-update', true); entry.updatedCode = style; @@ -152,6 +148,9 @@ function reportUpdateState({updated, style, error, STATES}) { error = t('updateCheckSkippedLocallyEdited') + '\n' + t('updateCheckManualUpdateHint'); } else if (error === STATES.MAYBE_EDITED) { error = t('updateCheckSkippedMaybeLocallyEdited') + '\n' + t('updateCheckManualUpdateHint'); + } else if (typeof error === 'object' && error.message) { + // UserCSS meta errors provide an object + error = error.message; } const message = same ? t('updateCheckSucceededNoUpdate') : error; newClasses.set('no-update', true);