Fix JSON validation

Remove dist folder

15 files changed, 21 insertions, 7 deletions

diff --git a/Changelog.md b/Changelog.md
index e8ea2f5..495974a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,22 +1,28 @@
-Version 1.0.0 / 16.11.2017
+#### Version 1.0.0 / 16.11.2017
 - Inital Release
 
-Version 1.1.0 / 18.11.2017
+#### Version 1.1.0 / 18.11.2017
 - Search tab added
 - Localisation added
 - Mobile design improved
 - Error handling improved
 
-Version 1.2.0 / 19.11.2017
+#### Version 1.2.0 / 19.11.2017
 - Added localisations
 - Added password miner
 - Improved mobile ui
 - Fixed Nextcloud Logout
 - Fixed Request Loop
 
-Version 1.3.0 / 20.11.2017
+#### Version 1.3.0 / 20.11.2017
 - Added Chromium compatibility
 - Added context menu
 - Added related password counter
 - Improved UI animation
-- Improved related passwords detection
\ No newline at end of file
+- Improved related passwords detection
+
+#### Version 1.3.1 / 28.11.2017
+- Improved API error handling
+- Fixed misleading search texts
+- Fixed JSON parsing issues
+- Fixed incorrect badge counter
\ No newline at end of file
diff --git a/src/js/Helper/api.js b/src/js/Helper/api.js
index 3831d59..490d1bc 100644
--- a/src/js/Helper/api.js
+++ b/src/js/Helper/api.js
@@ -59,7 +59,7 @@ class Api {
                     if (!data.hasOwnProperty(i) || data[i].deleted) continue;
                     let d = null,
                         p = data[i],
-                        prop = '{' + p.properties + '}';
+                        prop = '{' + Api.escapeJson(p.properties) + '}';
 
                     try {
                         d = JSON.parse(prop);
@@ -107,6 +107,14 @@ class Api {
         });
     }
 
+    static escapeJson(p) {
+        return p
+            .replace(/\n/g, '\\n')
+            .replace(/\t/g, '\\t')
+            .replace(/\\/g, '\\\\')
+            .replace(/\", ,/g, '\",');
+    }
+
     static passwordEncodingFailedNotification(id) {
         browser.notifications.create(
             'api-request-failed-'+id,
diff --git a/dist/_locales/de/messages.json b/src/platform/generic/_locales/de/messages.json
index 6f933dc..6f933dc 100644
--- a/dist/_locales/de/messages.json
+++ b/src/platform/generic/_locales/de/messages.json
diff --git a/dist/_locales/en/messages.json b/src/platform/generic/_locales/en/messages.json
index e8d09f9..e8d09f9 100644
--- a/dist/_locales/en/messages.json
+++ b/src/platform/generic/_locales/en/messages.json
diff --git a/dist/_locales/es/messages.json b/src/platform/generic/_locales/es/messages.json
index f6590fe..f6590fe 100644
--- a/dist/_locales/es/messages.json
+++ b/src/platform/generic/_locales/es/messages.json
diff --git a/dist/_locales/fr/messages.json b/src/platform/generic/_locales/fr/messages.json
index 658c5f1..658c5f1 100644
--- a/dist/_locales/fr/messages.json
+++ b/src/platform/generic/_locales/fr/messages.json
diff --git a/dist/_locales/it/messages.json b/src/platform/generic/_locales/it/messages.json
index 0362c0f..0362c0f 100644
--- a/dist/_locales/it/messages.json
+++ b/src/platform/generic/_locales/it/messages.json
diff --git a/dist/img/passwords-16.png b/src/platform/generic/img/passwords-16.png
index 58a4ac5..58a4ac5 100644
--- a/dist/img/passwords-16.png
+++ b/src/platform/generic/img/passwords-16.png
diff --git a/dist/img/passwords-32.png b/src/platform/generic/img/passwords-32.png
index d09a134..d09a134 100644
--- a/dist/img/passwords-32.png
+++ b/src/platform/generic/img/passwords-32.png
diff --git a/dist/img/passwords-48.png b/src/platform/generic/img/passwords-48.png
index d7ab9fd..d7ab9fd 100644
--- a/dist/img/passwords-48.png
+++ b/src/platform/generic/img/passwords-48.png
diff --git a/dist/img/passwords-96.png b/src/platform/generic/img/passwords-96.png
index 8784773..8784773 100644
--- a/dist/img/passwords-96.png
+++ b/src/platform/generic/img/passwords-96.png
diff --git a/dist/img/passwords-dark.svg b/src/platform/generic/img/passwords-dark.svg
index ec2459b..ec2459b 100755
--- a/dist/img/passwords-dark.svg
+++ b/src/platform/generic/img/passwords-dark.svg
diff --git a/dist/img/passwords-light.svg b/src/platform/generic/img/passwords-light.svg
index ac7b392..ac7b392 100755
--- a/dist/img/passwords-light.svg
+++ b/src/platform/generic/img/passwords-light.svg
diff --git a/dist/img/passwords.svg b/src/platform/generic/img/passwords.svg
index 2fb84e0..2fb84e0 100755
--- a/dist/img/passwords.svg
+++ b/src/platform/generic/img/passwords.svg
diff --git a/webpack.config.js b/webpack.config.js
index 15cedf2..1830d1d 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -19,7 +19,7 @@ module.exports = env => {
                 }
             }
         ),
-        new CopyWebpackPlugin(['src/platform/'+platform]),
+        new CopyWebpackPlugin(['src/platform/generic', 'src/platform/'+platform]),
         new ExtractTextPlugin('css/passwords.css')
     ];