From 180bc183caf77fa7f7c36b3380b40b3535bc3a9c Mon Sep 17 00:00:00 2001
From: George <georgej1088@gmail.com>
Date: Mon, 8 Jun 2020 10:36:30 -0400
Subject: [PATCH] Add usernotes manager icon to "moderated subreddits" popup
 (#317)

* Add usernotes mgr to "moderated subreddits" popup

* Remove unnecessary comment + variable
---
 extension/data/modules/modbar.js         | 28 +++++++++++++-----------
 extension/data/modules/usernotes.js      |  2 +-
 extension/data/styles/domaintagger.css   |  4 ++--
 extension/data/styles/old_queuetools.css |  2 +-
 extension/data/styles/queuetools.css     |  6 ++---
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/extension/data/modules/modbar.js b/extension/data/modules/modbar.js
index e5c577ab4..2a9e6b18d 100644
--- a/extension/data/modules/modbar.js
+++ b/extension/data/modules/modbar.js
@@ -264,6 +264,7 @@ function modbar () {
             let subList = '',
                 livefilterCount;
             const configEnabled = TB.storage.getSetting('TBConfig', 'enabled', false),
+                  usernotesEnabled = TB.storage.getSetting('UserNotes', 'enabled', false),
                   subredditColorSalt = self.setting('subredditColorSalt');
             TBCore.getModSubs(() => {
                 self.log('got mod subs');
@@ -271,19 +272,20 @@ function modbar () {
                 self.log(TBCore.mySubsData.length);
                 $(TBCore.mySubsData).each(function () {
                     const subColor = TBHelpers.stringToColor(this.subreddit + subredditColorSalt);
-                    subList = `${subList}
-<tr style="border-left: solid 3px ${subColor} !important;" data-subreddit="${this.subreddit}">
-    <td class="tb-my-subreddits-name"><a href="${TBCore.link(`/r/${this.subreddit}`)}" target="_blank">/r/${this.subreddit}</a></td>
-    <td class="tb-my-subreddits-subreddit">
-        <a title="/r/${this.subreddit} modmail!" target="_blank" href="${TBCore.link(`/r/${this.subreddit}/message/moderator`)}" data-type="modmail" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.oldModmail}</a>
-        <a title="/r/${this.subreddit} modqueue" target="_blank" href="${TBCore.link(`/r/${this.subreddit}/about/modqueue`)}" data-type="modqueue" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.modqueue}</a>
-        <a title="/r/${this.subreddit} unmoderated" target="_blank" href="${TBCore.link(`/r/${this.subreddit}/about/unmoderated`)}" data-type="unmoderated" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.unmoderated}</a>
-        <a title="/r/${this.subreddit} moderation log" target="_blank" href="${TBCore.link(`/r/${this.subreddit}/about/log`)}" data-type="modlog" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.modlog}</a>
-        <a title="/r/${this.subreddit} traffic stats" target="_blank" href="${TBCore.link(`/r/${this.subreddit}/about/traffic`)}" data-type="traffic" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.subTraffic}</a>
-        ${configEnabled ? `<a title="/r/${this.subreddit} config" href="javascript:;" class="tb-config-link tb-icons" data-subreddit="${this.subreddit}">${TBui.icons.tbSubConfig}</a>` : ''}
-    </td>
-</tr>
-`;
+                    subList += `
+                        <tr style="border-left: solid 3px ${subColor} !important;" data-subreddit="${this.subreddit}">
+                            <td class="tb-my-subreddits-name"><a href="${TBCore.link(`/r/${this.subreddit}`)}" target="_blank">/r/${this.subreddit}</a></td>
+                            <td class="tb-my-subreddits-subreddit">
+                                <a title="/r/${this.subreddit} modmail!" target="_blank" href="${TBCore.link(`/r/${this.subreddit}/message/moderator`)}" data-type="modmail" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.oldModmail}</a>
+                                <a title="/r/${this.subreddit} modqueue" target="_blank" href="${TBCore.link(`/r/${this.subreddit}/about/modqueue`)}" data-type="modqueue" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.modqueue}</a>
+                                <a title="/r/${this.subreddit} unmoderated" target="_blank" href="${TBCore.link(`/r/${this.subreddit}/about/unmoderated`)}" data-type="unmoderated" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.unmoderated}</a>
+                                <a title="/r/${this.subreddit} moderation log" target="_blank" href="${TBCore.link(`/r/${this.subreddit}/about/log`)}" data-type="modlog" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.modlog}</a>
+                                <a title="/r/${this.subreddit} traffic stats" target="_blank" href="${TBCore.link(`/r/${this.subreddit}/about/traffic`)}" data-type="traffic" data-subreddit="${this.subreddit}" class="tb-icons">${TBui.icons.subTraffic}</a>
+                                ${usernotesEnabled ? `<a title="/r/${this.subreddit} usernotes" href="javascript:;" class="tb-un-config-link tb-icons" data-subreddit="${this.subreddit}">${TBui.icons.usernote}</a>` : ''}
+                                ${configEnabled ? `<a title="/r/${this.subreddit} config" href="javascript:;" class="tb-config-link tb-icons" data-subreddit="${this.subreddit}">${TBui.icons.tbSubConfig}</a>` : ''}
+                            </td>
+                        </tr>
+                    `;
                 });
                 livefilterCount = TBCore.mySubs.length;
 
diff --git a/extension/data/modules/usernotes.js b/extension/data/modules/usernotes.js
index 202a8ee06..048b8628b 100644
--- a/extension/data/modules/usernotes.js
+++ b/extension/data/modules/usernotes.js
@@ -977,7 +977,7 @@ function usernotes () {
             self.endProfile('manager-run');
         }
 
-        $body.on('click', '#tb-un-config-link', function () {
+        $body.on('click', '#tb-un-config-link, .tb-un-config-link', function () {
             TB.ui.longLoadSpinner(true, 'Loading usernotes', TB.ui.FEEDBACK_NEUTRAL);
             const sub = $(this).attr('data-subreddit');
 
diff --git a/extension/data/styles/domaintagger.css b/extension/data/styles/domaintagger.css
index 5d69f21d0..b9651fd46 100644
--- a/extension/data/styles/domaintagger.css
+++ b/extension/data/styles/domaintagger.css
@@ -8,11 +8,11 @@
 
 /* Popup */
 
-.mod-toolbox-rd .tb-popup.dtagger-popup {
+.mod-toolbox-rd .tb-window.dtagger-popup {
     max-width: 900px;
     text-align: center;
 }
-.mod-toolbox-rd .tb-popup.dtagger-popup .dt-popup-content {
+.mod-toolbox-rd .tb-window.dtagger-popup .dt-popup-content {
     display: inline-block;
 }
 .mod-toolbox-rd .dtagger-popup .right {
diff --git a/extension/data/styles/old_queuetools.css b/extension/data/styles/old_queuetools.css
index 206dae97f..0a6d7b53f 100644
--- a/extension/data/styles/old_queuetools.css
+++ b/extension/data/styles/old_queuetools.css
@@ -19,7 +19,7 @@
     width: 24px;
 }
 
-.mod-toolbox-rd.res-nightmode .tb-popup.context-button-popup {
+.mod-toolbox-rd.res-nightmode .tb-window.context-button-popup {
     background-color: #262626;
 }
 
diff --git a/extension/data/styles/queuetools.css b/extension/data/styles/queuetools.css
index 7751858ae..850a0020e 100644
--- a/extension/data/styles/queuetools.css
+++ b/extension/data/styles/queuetools.css
@@ -103,10 +103,10 @@
     background: #fff
 }
 
-.tb-popup.queuetools-select-popup .divider {
+.tb-window.queuetools-select-popup .divider {
     margin-top: 8px
 }
 
-.tb-popup.queuetools-select-popup .choice {
+.tb-window.queuetools-select-popup .choice {
     margin-top: 2px
-}
\ No newline at end of file
+}