Merge pull request #191 from Expensify/tgolen-fix-sidebarrendering

Check every second to redraw pickers

CHANGELOG.md

@@ -1,3 +1,6 @@
+#1.3.64
+- Fix the sidebar not redrawing when looking at GH issues
+
 #1.3.63
 - Allow for code owners to be assigned when there is only one person assigned
 - Show on the K2 dashboard if an issue has an owner, and you're not the owner

assets/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
 
   "name": "K2 for GitHub",
-  "version": "1.3.63",
+  "version": "1.3.64",
   "description": "Manage your Kernel Scheduling from directly inside GitHub",
 
   "browser_specific_settings": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "k2-extension",
-  "version": "1.3.63",
+  "version": "1.3.64",
   "description": "A Chrome Extension for Kernel Schedule",
   "private": true,
   "scripts": {

src/js/lib/pages/github/issue.js

@@ -153,27 +153,19 @@ export default function () {
         }
         allreadySetup = true;
 
-        let refreshPickerTimeoutID;
-        let refreshAssigneesTimeoutID;
+        // Draw them once when the page is loaded
         setTimeout(refreshPicker, 500);
         setTimeout(refreshAssignees, 500);
 
-        // Listen for when the sidebar is redrawn, then redraw our pickers
-        $(document).bind('DOMNodeRemoved', (e) => {
-            if ($(e.target).hasClass('sidebar-assignee')) {
-                // Make sure that only one setTimeout runs at a time
-                clearTimeout(refreshAssigneesTimeoutID);
-                refreshAssigneesTimeoutID = setTimeout(refreshAssignees, 500);
+        // Every second, check to see if the pickers are still there, and if not, redraw them
+        setInterval(() => {
+            if (!$('.k2picker-wrapper').length) {
+                refreshPicker();
             }
-
-            if ($(e.target).is('#partial-discussion-sidebar')) {
-                // Make sure that only one setTimeout runs at a time
-                clearTimeout(refreshPickerTimeoutID);
-                refreshPickerTimeoutID = setTimeout(refreshPicker, 500);
-                clearTimeout(refreshAssigneesTimeoutID);
-                refreshAssigneesTimeoutID = setTimeout(refreshAssignees, 500);
+            if (!$('.js-issue-assignees .k2-element').length) {
+                refreshAssignees();
             }
-        });
+        }, 1000);
     };
 
     return IssuePage;