Skip to content

Commit 1fc2135

Browse files
committed
[merge] fixes
1 parent 01a2bea commit 1fc2135

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

api/configextender.js

+4-14
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,17 @@
1-
/**
2-
* Try to parse provided value as JSON, or some other value
3-
* @param {string} val - value to parse
4-
* @returns {string|object} parsed value
5-
**/
6-
var defaultParser = function(val) {
1+
var parser = function(val) {
72
var parsedVal;
83
try {
94
parsedVal = JSON.parse(val);
105
if (typeof val === typeof parsedVal) {
116
val = parsedVal;
12-
}
13-
else if (val === parsedVal.toString()) {
7+
} else if (val === parsedVal.toString()) {
148
val = parsedVal;
15-
}
16-
else if (Array.isArray(parsedVal)) {
9+
} else if (Array.isArray(parsedVal)) {
1710
val = parsedVal;
1811
} else if (typeof parsedVal === 'object') {
1912
val = parsedVal;
2013
}
21-
}
22-
catch (error) {
23-
// silent error
24-
}
14+
} catch (error) {}
2515
return val;
2616
};
2717

plugins/crashes/api/api.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ plugins.setConfigs("crashes", {
273273
if (error !== "") {
274274
var report = {};
275275
for (let i = 0, l = props.length; i < l; i++) {
276-
if(typeof params.qstring.crash["_"+props[i]] !== "undefined")
276+
if(typeof params.qstring.crash["_"+props[i]] !== "undefined") {
277277
if (bools[props[i]]) {
278278
if(params.qstring.crash["_"+props[i]]+"" === "false") {
279279
report[props[i]] = 0;

0 commit comments

Comments
 (0)