Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/sualko/cloud_piwik.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorsualko <klaus@jsxc.org>2017-01-09 23:33:16 +0300
committersualko <klaus@jsxc.org>2017-01-09 23:33:16 +0300
commit6b920bc16a5eb8176121d5aa8af1f27d6946cd9e (patch)
tree2e230c7b9a965580bf861215c5c16cd908f910a7 /js
parent302954e81955f042c4a94baab7bc5adfcd33907c (diff)
catch parsing error (fix #21)
Diffstat (limited to 'js')
-rw-r--r--js/settings-admin.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/js/settings-admin.js b/js/settings-admin.js
index b331e36..c0afb58 100644
--- a/js/settings-admin.js
+++ b/js/settings-admin.js
@@ -2,7 +2,12 @@
$(function() {
OC.AppConfig.getValue('piwik', 'piwik', {}, function(piwik) {
- piwik = JSON.parse(piwik) || {};
+ if (piwik) {
+ try {
+ piwik = JSON.parse(piwik);
+ } catch(err) {}
+ }
+ piwik = piwik || {};
$('#piwikSiteId').val(piwik.siteId);
$('#piwikUrl').val(piwik.url);