Merge pull request #5 from discoveryjs/settings-discovery

Rewrited settings page using discovery
discoveryjs · Mar 11, 2019 · e078ca8 · e078ca8
2 parents e5c6413 + 0186821
commit e078ca8
Show file tree

Hide file tree

Showing 10 changed files with 248 additions and 86 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.4.0 (09-03-2019)
+
+* Settings page is now using `discovery` under hood
+* Some pages with CSP-header may brake extension functionality ([Crome bug](https://bugs.chromium.org/p/chromium/issues/detail?id=816121)). For such cases added fallback
+* Extension now check if content is HTML before trying to parse JSON
+
 ## 1.3.1 (13-02-2019)
 
 * Updated `discovery` and `jora`

diff --git a/core/page.ejs b/core/page.ejs
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title><%= htmlWebpackPlugin.options.title %></title>  
+    <title><%= htmlWebpackPlugin.options.title %></title>
     <link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons' rel="stylesheet" type="text/css">
   </head>
   <body>

diff --git a/core/settings.ejs b/core/settings.ejs
@@ -3,25 +3,8 @@
     <head>
         <meta charset="utf-8">
         <title><%= htmlWebpackPlugin.options.title %></title>
-        <link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons' rel="stylesheet" type="text/css">
-        <style>
-            .row {
-                margin-bottom: 10px;
-            }
-        </style>
     </head>
     <body>
-        <div id="root">
-            <h1>Settings</h1>
-            <form id="settings-form">
-                <div class="row">
-                    <input type="number" min="0" id="expand" required> Expand level
-                </div>
-                <div class="row">
-                    <input type="submit" id="save" value="Save">
-                    <span id="status"></span>
-                </div>
-            </form>
-        </div>
+        <div id="root"></div>
     </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsondiscovery",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "DiscoveryJson",
   "author": "[email protected]",
   "license": "MIT",

diff --git a/src/content/index.css b/src/content/index.css
@@ -5,3 +5,27 @@
 .user-select {
     user-select: text;
 }
+
+.view-fieldset {
+    width: 400px;
+    display: flex;
+    margin: 8px 0;
+}
+
+.view-fieldset > * + * {
+    margin-left: 6px;
+}
+
+.view-fieldset .view-input {
+    flex: 1;
+}
+
+.view-label {
+    line-height: 34px;
+}
+
+.view-flash-message {
+    position: fixed;
+    top: 20px;
+    right: 20px;
+}
diff --git a/src/content/index.js b/src/content/index.js
@@ -105,6 +105,8 @@ function initDiscovery(settings) {
         }, '*');
     };
 
+    parent.postMessage({ scriptLoaded: true }, '*');
+
     return discovery;
 }
 
@@ -128,9 +130,3 @@ window.addEventListener('message', function(event) {
         );
     }
 }, false);
-
-// window.addEventListener('hashchange', () => {
-//     parent.postMessage({
-//         hash: window.location.hash
-//     }, '*');
-// });