From 9f75b69cd899f93f61dbd38a8ec9d2d094bdafd8 Mon Sep 17 00:00:00 2001
From: Rob Garrison <wowmotty@gmail.com>
Date: Wed, 7 Mar 2018 11:54:05 -0600
Subject: [PATCH] Include iframe urls in exclusion popup

---
 popup/popup-exclusions.js | 65 ++++++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 14 deletions(-)

diff --git a/popup/popup-exclusions.js b/popup/popup-exclusions.js
index 4bbc839d..97d2309d 100644
--- a/popup/popup-exclusions.js
+++ b/popup/popup-exclusions.js
@@ -22,7 +22,7 @@ const popupExclusions = (() => {
   }
 
   /* Modal in Popup.html */
-  function createPopupContent(url) {
+  function processURL(url) {
     const results = [];
     const protocol = url.match(/\w+:\/\//);
     const parts = url.replace(/(\w+:\/\/|[#?].*$)/g, '').split('/');
@@ -42,23 +42,65 @@ const popupExclusions = (() => {
       results.push([t('excludedDomain'), domain.join('.')]);
       domain.shift();
     }
+    return results.reverse();
+  }
+
+  function createOption(option) {
+    // ["Domain/Prefix", "{url}"]
+    return $create('option', {
+      value: option[1],
+      title: option[1],
+      textContent: `${option[0]}: ${option[1]}`
+    });
+  }
+
+  function createPopupContent(url) {
+    const options = processURL(url);
     return [
       $create('h2', {textContent: t('exclusionsEditTitle')}),
       $create('select', {
         id: 'popup-exclusions',
-        size: results.length,
+        size: options.length,
         multiple: 'true',
         value: ''
       }, [
-        ...results.reverse().map(link => $create('option', {
-          value: link[1],
-          title: link[1],
-          textContent: `${link[0]}: ${link[1]}`
-        }))
+        ...options.map(option => createOption(option))
       ])
     ];
   }
 
+  function getIframeURLs(style) {
+    getActiveTab().then(tab => {
+      if (tab && tab.status === 'complete') {
+        chrome.webNavigation.getAllFrames({
+          tabId: tab.id
+        }, frames => {
+          const urls = frames.reduce((acc, frame) => processURL(frame.url), []);
+          updateSelections(style, urls);
+        });
+      }
+    });
+  }
+
+  function updateSelections(style, newOptions = []) {
+    const select = $('select', messageBox.element);
+    const exclusions = Object.keys(style.exclusions || {});
+    if (newOptions.length) {
+      const currentOptions = [...select.children].map(opt => opt.value);
+      newOptions.forEach(opt => {
+        if (!currentOptions.includes(opt[1])) {
+          select.appendChild(createOption(opt));
+        }
+      });
+      select.size = select.children.length;
+    }
+    [...select.children].forEach(option => {
+      if (exclusionExists(exclusions, option.value).length) {
+        option.selected = true;
+      }
+    });
+  }
+
   function openPopupDialog(style, tabURL) {
     const msgBox = messageBox({
       title: style.name,
@@ -70,13 +112,8 @@ const popupExclusions = (() => {
         contents.style = `max-width: calc(${popupWidth} - 20px); max-height: none;`;
         document.body.style.minWidth = popupWidth;
         document.body.style.minHeight = popupWidth;
-        const select = $('select', messageBox.element);
-        const exclusions = Object.keys(style.exclusions || {});
-        [...select.children].forEach(option => {
-          if (exclusionExists(exclusions, option.value).length) {
-            option.selected = true;
-          }
-        }, []);
+        updateSelections(style);
+        getIframeURLs(style);
         $('#message-box-buttons button', messageBox.element).onclick = function () {
           handlePopupSave(style, this);
         };