ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix some pageless calls (switching to $.parseJSON) 

These were missed when we changed all the JSON.parse calls to $.parseJSON to
support the new security measures around JSON data sniffing.

Refs #6459

Test Plan: Check that the pageless contents loading still works for
announcements, inbox items, page views on a user profile, discussion topics,
and wiki pages.

Change-Id: I3e0b4dafb99aed692a16ac336dd7001735ab0ee8
Reviewed-on: https://gerrit.instructure.com/7192
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
This commit is contained in:
Zach Wily 2011-11-29 14:29:20 -07:00
parent e347c927e2
commit ba73b76bfc
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/announcements/index.html.erb
View File

@ -188,7 +188,7 @@
scrape: function(data) {
if(typeof(data) == 'string') {
try {
data = JSON.parse(data);
data = $.parseJSON(data);
} catch(e) {
data = [];
}

2
app/views/context/_inbox_items.html.erb
View File

@ -59,7 +59,7 @@
scrape: function(data) {
if(typeof(data) == 'string') {
try {
data = JSON.parse(data);
data = $.parseJSON(data);
} catch(e) {
data = [];
}

2
app/views/context/roster_user_usage.html.erb
View File

@ -102,7 +102,7 @@
scrape: function(data) {
if(typeof(data) == 'string') {
try {
data = JSON.parse(data);
data = $.parseJSON(data);
} catch(e) {
data = [];
}

2
app/views/discussion_topics/index.html.erb
View File

@ -45,7 +45,7 @@
scrape: function(data) {
if(typeof(data) == 'string') {
try {
data = JSON.parse(data);
data = $.parseJSON(data);
} catch(e) {
data = [];
}

2
app/views/wiki_pages/_content.html.erb
View File

@ -160,7 +160,7 @@ course will see this page first. You can change that from [the course home page
scrape: function(data) {
if(typeof(data) == 'string') {
try {
data = JSON.parse(data);
data = $.parseJSON(data);
} catch(e) {
data = [];
}