diff options
author | Felix Nüsse <felix.nuesse@t-online.de> | 2019-05-13 16:48:11 +0300 |
---|---|---|
committer | Felix Nüsse <felix.nuesse@t-online.de> | 2019-05-13 18:12:29 +0300 |
commit | e4dfc21a27456ffdc17c6cb29a3ada83b89e807d (patch) | |
tree | a98196a8350c098684449d0101a8d367cf329e09 | |
parent | 345fcadd788293d00c130bbc956048514cfa29b4 (diff) |
switched from trycatch to null/undefined-checkfix/578/sidebarmissingbecauseofinvalidjson
Signed-off-by: Felix Nüsse <felix.nuesse@t-online.de>
-rw-r--r-- | js/app/services/searchboxexpanderservice.js | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/js/app/services/searchboxexpanderservice.js b/js/app/services/searchboxexpanderservice.js index 287040be..f465421d 100644 --- a/js/app/services/searchboxexpanderservice.js +++ b/js/app/services/searchboxexpanderservice.js @@ -49,25 +49,16 @@ }); function getSearchFieldArraySettings(){ - var res = SettingsService.getSetting('searchbox_settings'); - if(res!== ""){ - //if this fails, the full controller crashes, resulting in the sidebar beeing disabled. If the res string is not valid, just fall back to the defaults. - try { - searchfields = JSON.parse(res); - } catch(e) { - //Fall back to default - searchfields=defaults; - } - - }else{ + if(typeof(res) !== "undefined" && res !== null && res!== ""){ + searchfields = JSON.parse(res); + }else{ searchfields=defaults; } - - } + function getSearchFieldArrayForFiltering(){ var fields=[]; for (var key in searchfields) { |