Skip to content

decodeJson should use JSON.parse() when available #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cynthia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

decodeJson should use JSON.parse() when available #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/data/data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,14 @@
throw new Error("glow.data.decodeJson: cannot decode item");
}

// If JSON.parse() is available use that instead of eval().
// options that are passed to decodeJson() are only safety
// guarantees which are automatically handled with JSON.parse(),
// hence return immediately without acknowledging the options.

if(window.JSON && window.JSON.parse)
return window.JSON.parse(text);

options = options || {};
options.safeMode = options.safeMode || false;

Expand Down