commit 462280fb9447e52a8019915f09ffed0fcceda7b1
author Adrià Vilanova Martínez <me@avm99963.com> Sat Aug 07 22:59:02 2021 +0200
committer Adrià Vilanova Martínez <me@avm99963.com> Sat Aug 07 23:16:57 2021 +0200
tree 2b35a241b4abc7e50a991242251512b5364ee3a1
parent b8e442b52f302be4633bd10d8b97a5d709b4f3c4

Refactor BatchLock code

This will hopefully make it a little bit clearer.

Change-Id: Ie6b7159c3821adc09cf8e07f1a70f6caf0ff9e27

src/contentScripts/communityConsole/batchLock.js

diff --git a/src/contentScripts/communityConsole/batchLock.js b/src/contentScripts/communityConsole/batchLock.js
index c8aca09..3b414b5 100644
--- a/src/contentScripts/communityConsole/batchLock.js
+++ b/src/contentScripts/communityConsole/batchLock.js
@@ -1,30 +1,19 @@
-import {removeChildNodes, createExtBadge} from './utils/common.js';
+import {createExtBadge, removeChildNodes} from './utils/common.js';
 
-export function nodeIsReadToggleBtn(node) {
-  return ('tagName' in node) && node.tagName == 'MATERIAL-BUTTON' &&
-      node.getAttribute('debugid') !== null &&
-      (node.getAttribute('debugid') == 'mark-read-button' ||
-       node.getAttribute('debugid') == 'mark-unread-button') &&
-      ('parentNode' in node) && node.parentNode !== null &&
-      ('parentNode' in node.parentNode) &&
-      node.parentNode.querySelector('[debugid="batchlock"]') === null &&
-      node.parentNode.parentNode !== null &&
-      ('tagName' in node.parentNode.parentNode) &&
-      node.parentNode.parentNode.tagName == 'EC-BULK-ACTIONS';
-}
-
-export function addBatchLockBtn(readToggle) {
-  var clone = readToggle.cloneNode(true);
-  clone.setAttribute('debugid', 'batchlock');
-  clone.classList.add('TWPT-btn--with-badge');
-  clone.setAttribute('title', chrome.i18n.getMessage('inject_lockbtn'));
-  clone.querySelector('material-icon').setAttribute('icon', 'lock');
-  clone.querySelector('i.material-icon-i').textContent = 'lock';
-
-  var badge = createExtBadge();
-  clone.append(badge);
-
-  clone.addEventListener('click', function() {
+export var batchLock = {
+  nodeIsReadToggleBtn(node) {
+    return ('tagName' in node) && node.tagName == 'MATERIAL-BUTTON' &&
+        node.getAttribute('debugid') !== null &&
+        (node.getAttribute('debugid') == 'mark-read-button' ||
+         node.getAttribute('debugid') == 'mark-unread-button') &&
+        ('parentNode' in node) && node.parentNode !== null &&
+        ('parentNode' in node.parentNode) &&
+        node.parentNode.querySelector('[debugid="batchlock"]') === null &&
+        node.parentNode.parentNode !== null &&
+        ('tagName' in node.parentNode.parentNode) &&
+        node.parentNode.parentNode.tagName == 'EC-BULK-ACTIONS';
+  },
+  createDialog() {
     var modal = document.querySelector('.pane[pane-id="default-1"]');
 
     var dialog = document.createElement('material-dialog');
@@ -120,14 +109,29 @@
     modal.append(dialog);
     modal.classList.add('visible', 'modal');
     modal.style.display = 'flex';
-  });
+  },
+  addButton(readToggle) {
+    var clone = readToggle.cloneNode(true);
+    clone.setAttribute('debugid', 'batchlock');
+    clone.classList.add('TWPT-btn--with-badge');
+    clone.setAttribute('title', chrome.i18n.getMessage('inject_lockbtn'));
+    clone.querySelector('material-icon').setAttribute('icon', 'lock');
+    clone.querySelector('i.material-icon-i').textContent = 'lock';
 
-  var duplicateBtn =
-      readToggle.parentNode.querySelector('[debugid="mark-duplicate-button"]');
-  if (duplicateBtn)
-    duplicateBtn.parentNode.insertBefore(
-        clone, (duplicateBtn.nextSibling || duplicateBtn));
-  else
-    readToggle.parentNode.insertBefore(
-        clone, (readToggle.nextSibling || readToggle));
-}
+    var badge = createExtBadge();
+    clone.append(badge);
+
+    clone.addEventListener('click', () => {
+      this.createDialog();
+    });
+
+    var duplicateBtn = readToggle.parentNode.querySelector(
+        '[debugid="mark-duplicate-button"]');
+    if (duplicateBtn)
+      duplicateBtn.parentNode.insertBefore(
+          clone, (duplicateBtn.nextSibling || duplicateBtn));
+    else
+      readToggle.parentNode.insertBefore(
+          clone, (readToggle.nextSibling || readToggle));
+  }
+};

src/contentScripts/communityConsole/main.js

diff --git a/src/contentScripts/communityConsole/main.js b/src/contentScripts/communityConsole/main.js
index 3924af6..08e3e71 100644
--- a/src/contentScripts/communityConsole/main.js
+++ b/src/contentScripts/communityConsole/main.js
@@ -2,7 +2,7 @@
 
 import {autoRefresh} from './autoRefresh.js';
 import AvatarsHandler from './avatars.js';
-import {addBatchLockBtn, nodeIsReadToggleBtn} from './batchLock.js';
+import {batchLock} from './batchLock.js';
 import {injectDarkModeButton, isDarkThemeOn} from './darkMode.js';
 import {applyDragAndDropFix} from './dragAndDropFix.js';
 import {injectPreviousPostsLinks} from './profileHistoryLink.js';
@@ -105,8 +105,8 @@
     }
 
     // Inject the batch lock button in the thread list
-    if (options.batchlock && nodeIsReadToggleBtn(node)) {
-      addBatchLockBtn(node);
+    if (options.batchlock && batchLock.nodeIsReadToggleBtn(node)) {
+      batchLock.addButton(node);
     }
 
     // Inject avatar links to threads in the thread list