mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 16:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Use parse instead of parseJSON. (#5869)

Browse source
This commit is contained in:
SamTV12345 2023-08-08 19:12:41 +02:00 • committed by GitHub
parent a096f1ae33
commit b56d75b1e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/static/js/admin/settings.js
View file

@ -62,7 +62,7 @@ const isJSONClean = (data) => {
// this is a bit naive. In theory some key/value might contain the sequences ',]' or ',}' // this is a bit naive. In theory some key/value might contain the sequences ',]' or ',}'
cleanSettings = cleanSettings.replace(',]', ']').replace(',}', '}'); cleanSettings = cleanSettings.replace(',]', ']').replace(',}', '}');
try { try {
return typeof JSON.parseJSON(cleanSettings) === 'object'; return typeof JSON.parse(cleanSettings) === 'object';
} catch (e) { } catch (e) {
return false; // the JSON failed to be parsed return false; // the JSON failed to be parsed
} }

2
src/static/js/vendors/farbtastic.js vendored
View file

@ -33,7 +33,7 @@ $._farbtastic = function (container, options) {
fb.linkTo = function (callback) { fb.linkTo = function (callback) {
// Unbind previous nodes // Unbind previous nodes
if (typeof fb.callback == 'object') { if (typeof fb.callback == 'object') {
$(fb.callback).off('keyup').on('keyup').on('keyup', fb.updateValue); $(fb.callback).off('keyup').on('keyup', fb.updateValue);
} }
// Reset color // Reset color