From 720474858f2f52ad62934b43c346b49165c461ac Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sat, 28 Oct 2017 15:35:39 +0100
Subject: Add backup/restore for Vimium options.

See the *very* bottom of the options page (below advanced settings).

Clicking "Backup" creates a JSON file.

Selecting a backup populates the options inputs, the user then clicks *Save Changes* to confirm.
---
 pages/options.html | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'pages/options.html')

diff --git a/pages/options.html b/pages/options.html
index 46307b6f..943fc95c 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -315,6 +315,32 @@ b: http://b.com/?q=%s description
           </tr>
           -->
         </tbody>
+        <tbody id='backupAndRestor'>
+          <tr>
+            <td colspan="2"><header>Backup and Restore</header></td>
+          </tr>
+          <tr>
+            <td class="caption">Backup</td>
+            <td>
+                <div class="help">
+                  <div class="example">
+                  </div>
+                </div>
+              <input id="backupButton" type="button" value="Create Backup" />
+            </td>
+          </tr>
+          <tr>
+            <td class="caption">Restore</td>
+            <td>
+                <div class="help">
+                  <div class="example">
+                    Choose file, then click <i>Save Changes</i>, below, to confirm restore.
+                  </div>
+                </div>
+              <input id="chooseFile" type="file" accept=".json" style="width: 200px;"/>
+            </td>
+          </tr>
+        </tbody>
       </table>
     </div>
 
-- 
cgit v1.2.3


From b1f6da21a882f84965de73eea175475f5d8f7b37 Mon Sep 17 00:00:00 2001
From: mrmr1993
Date: Sat, 28 Oct 2017 16:42:51 +0100
Subject: FF: Show backup download link in the options page

Firefox doesn't seem to respect the |download| attribute for links, and
it garbage collects our blob URL when we navigate away from the options
page (to the object URL). We work around this by simply showing the
download link in Firefox.

Disappointingly, the user needs to right-click the link and choose to
download from the context menu.

Behaviour in Chrome is unchanged, except that the download link is now
visible.
---
 pages/options.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pages/options.html')

diff --git a/pages/options.html b/pages/options.html
index 943fc95c..79cb0999 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -327,6 +327,7 @@ b: http://b.com/?q=%s description
                   </div>
                 </div>
               <input id="backupButton" type="button" value="Create Backup" />
+              <a id="backupLink" style="display: none" download="vimium-options.json">Download Backup</span>
             </td>
           </tr>
           <tr>
-- 
cgit v1.2.3