From b47bc7317ec4aab41bd32a3a6753977bccebe743 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 17 Dec 2018 11:04:48 -0500
Subject: [PATCH] json exports

---
 jslib                               | 2 +-
 src/app/vault/export.component.html | 9 ++++++++-
 src/locales/en/messages.json        | 7 +++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/jslib b/jslib
index 27566c3fd5..3b22df15e8 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 27566c3fd5a1040112278c7ad0a50c6b8d45e3e4
+Subproject commit 3b22df15e8cb2f14c2b4dfe996af9bbb721902d0
diff --git a/src/app/vault/export.component.html b/src/app/vault/export.component.html
index f9b8f034a3..7529465577 100644
--- a/src/app/vault/export.component.html
+++ b/src/app/vault/export.component.html
@@ -7,6 +7,13 @@
                         {{'exportVault' | i18n}}
                     </div>
                     <div class="box-content">
+                        <div class="box-content-row" appBoxRow>
+                            <label for="format">{{'fileFormat' | i18n}}</label>
+                            <select id="format" name="Format" [(ngModel)]="format">
+                                <option value="json">.json</option>
+                                <option value="csv">.csv</option>
+                            </select>
+                        </div>
                         <div class="box-content-row box-content-row-flex" appBoxRow>
                             <div class="row-main">
                                 <label for="masterPassword">{{'masterPass' | i18n}}</label>
@@ -25,7 +32,7 @@
                     </div>
                     <div class="box-footer">
                         <p>{{'exportMasterPassword' | i18n}}</p>
-                        <strong>{{'warning' | i18n}}</strong>: {{'exportWarning' | i18n}}
+                        <strong>{{'warning' | i18n}}</strong>: {{'exportWarningDesc' | i18n}}
                     </div>
                 </div>
             </div>
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 63400d775f..838a3b58d6 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1118,12 +1118,15 @@
   "exportVault": {
     "message": "Export Vault"
   },
+  "fileFormat": {
+    "message": "File Format"
+  },
   "warning": {
     "message": "WARNING",
     "description": "WARNING (should stay in capitalized letters if the language permits)"
   },
-  "exportWarning": {
-    "message": "This export contains your unencrypted data in .csv format. You should not store or send it over unsecure channels (such as email). Delete it immediately after you are done using it."
+  "exportWarningDesc": {
+    "message": "This export contains your vault data in an unencrypted format. You should not store or send the exported file over unsecure channels (such as email). Delete it immediately after you are done using it."
   },
   "exportMasterPassword": {
     "message": "Enter your master password to export your vault data."