Allow apiInjectStylesheet to inject a URL

3 files changed, 19 insertions, 10 deletions

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index d1a34f82..eeed841c 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -499,19 +499,28 @@ class Backend {
         return Promise.resolve({frameId});
     }
 
-    _onApiInjectStylesheet({css}, sender) {
+    _onApiInjectStylesheet({type, value}, sender) {
         if (!sender.tab) {
             return Promise.reject(new Error('Invalid tab'));
         }
 
         const tabId = sender.tab.id;
         const frameId = sender.frameId;
-        const details = {
-            code: css,
-            runAt: 'document_start',
-            cssOrigin: 'user',
-            allFrames: false
-        };
+        const details = (
+            type === 'file' ?
+            {
+                file: value,
+                runAt: 'document_start',
+                cssOrigin: 'author',
+                allFrames: false
+            } :
+            {
+                code: value,
+                runAt: 'document_start',
+                cssOrigin: 'user',
+                allFrames: false
+            }
+        );
         if (typeof frameId === 'number') {
             details.frameId = frameId;
         }
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 45203c03..970c5343 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -167,7 +167,7 @@ class Popup {
         } else {
             if (!css) { return; }
             try {
-                await apiInjectStylesheet(css);
+                await apiInjectStylesheet('code', css);
                 this._stylesheetInjectedViaApi = true;
             } catch (e) {
                 // NOP
diff --git a/ext/mixed/js/api.js b/ext/mixed/js/api.js
index 86bdc73c..14900ecf 100644
--- a/ext/mixed/js/api.js
+++ b/ext/mixed/js/api.js
@@ -89,8 +89,8 @@ function apiFrameInformationGet() {
     return _apiInvoke('frameInformationGet');
 }
 
-function apiInjectStylesheet(css) {
-    return _apiInvoke('injectStylesheet', {css});
+function apiInjectStylesheet(type, value) {
+    return _apiInvoke('injectStylesheet', {type, value});
 }
 
 function apiGetEnvironmentInfo() {