From d6cdd693c87ffd999cb770172629a256c0b7dde1 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sun, 10 Nov 2019 13:55:37 -0500
Subject: [PATCH] Fix several warnings about name conflicts

---
 ext/bg/js/settings.js   | 12 ++++++------
 ext/mixed/js/display.js |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ext/bg/js/settings.js b/ext/bg/js/settings.js
index 9d95e358..129d5f10 100644
--- a/ext/bg/js/settings.js
+++ b/ext/bg/js/settings.js
@@ -188,8 +188,8 @@ async function onFormOptionsChanged(e) {
             await ankiDeckAndModelPopulate(options);
             ankiErrorShow();
         }
-    } catch (e) {
-        ankiErrorShow(e);
+    } catch (error) {
+        ankiErrorShow(error);
     } finally {
         ankiSpinnerShow(false);
     }
@@ -602,8 +602,8 @@ async function onAnkiModelChanged(e) {
         ankiSpinnerShow(true);
         await ankiFieldsPopulate(element, options);
         ankiErrorShow();
-    } catch (e) {
-        ankiErrorShow(e);
+    } catch (error) {
+        ankiErrorShow(error);
     } finally {
         ankiSpinnerShow(false);
     }
@@ -627,8 +627,8 @@ async function onAnkiFieldTemplatesResetConfirm(e) {
         $('#field-templates').val(fieldTemplates);
         onAnkiTemplatesValidateCompile();
         await settingsSaveOptions();
-    } catch (e) {
-        ankiErrorShow(e);
+    } catch (error) {
+        ankiErrorShow(error);
     }
 }
 
diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js
index df887fb0..5a824561 100644
--- a/ext/mixed/js/display.js
+++ b/ext/mixed/js/display.js
@@ -77,8 +77,8 @@ class Display {
 
             const definitions = await apiKanjiFind(link.textContent, this.getOptionsContext());
             this.setContentKanji(definitions, context);
-        } catch (e) {
-            this.onError(e);
+        } catch (error) {
+            this.onError(error);
         }
     }
 
@@ -140,8 +140,8 @@ class Display {
             }
 
             this.setContentTerms(definitions, context);
-        } catch (e) {
-            this.onError(e);
+        } catch (error) {
+            this.onError(error);
         }
     }