From f0c974d319d9fb4c50c9a4a8f665a642edb77d58 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Sat, 22 Aug 2020 15:49:24 -0400
Subject: Move generateId to core.js (#748)

---
 ext/fg/js/frame-offset-forwarder.js | 2 +-
 ext/fg/js/frontend.js               | 2 +-
 ext/fg/js/popup-factory.js          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ext/fg/js')

diff --git a/ext/fg/js/frame-offset-forwarder.js b/ext/fg/js/frame-offset-forwarder.js
index 94775105..e2c34736 100644
--- a/ext/fg/js/frame-offset-forwarder.js
+++ b/ext/fg/js/frame-offset-forwarder.js
@@ -42,7 +42,7 @@ class FrameOffsetForwarder {
             return [0, 0];
         }
 
-        const uniqueId = yomichan.generateId(16);
+        const uniqueId = generateId(16);
 
         const frameOffsetPromise = yomichan.getTemporaryListenerResult(
             chrome.runtime.onMessage,
diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index 981852db..caa2bd3e 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -33,7 +33,7 @@ class Frontend {
         isSearchPage,
         allowRootFramePopupProxy
     }) {
-        this._id = yomichan.generateId(16);
+        this._id = generateId(16);
         this._popup = null;
         this._disabledOverride = false;
         this._options = null;
diff --git a/ext/fg/js/popup-factory.js b/ext/fg/js/popup-factory.js
index ab450b26..03ac603b 100644
--- a/ext/fg/js/popup-factory.js
+++ b/ext/fg/js/popup-factory.js
@@ -86,7 +86,7 @@ class PopupFactory {
         if (frameId === this._frameId) {
             // New unique id
             if (id === null) {
-                id = yomichan.generateId(16);
+                id = generateId(16);
             }
             const popup = new Popup(id, depth, frameId, ownerFrameId);
             if (parent !== null) {
-- 
cgit v1.2.3