eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge from chimo: Catch GeoCookie JSON parsing error

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-06-05 09:33:30 +02:00
commit 3f9a16dc58
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/util.js
View File

@ -1177,18 +1177,22 @@ var SN = { // StatusNet
} }
} }
} else { } else {
var cookieValue = JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie)); try {
var cookieValue = JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));
form.find('[name=lat]').val(cookieValue.NLat); form.find('[name=lat]').val(cookieValue.NLat);
form.find('[name=lon]').val(cookieValue.NLon); form.find('[name=lon]').val(cookieValue.NLon);
form.find('[name=location_ns]').val(cookieValue.NLNS); form.find('[name=location_ns]').val(cookieValue.NLNS);
form.find('[name=location_id]').val(cookieValue.NLID); form.find('[name=location_id]').val(cookieValue.NLID);
form.find('[name=notice_data-geo]').prop('checked', cookieValue.NDG); form.find('[name=notice_data-geo]').prop('checked', cookieValue.NDG);
SN.U.NoticeGeoStatus(form, cookieValue.NLN, cookieValue.NLat, cookieValue.NLon, cookieValue.NLNU); SN.U.NoticeGeoStatus(form, cookieValue.NLN, cookieValue.NLat, cookieValue.NLon, cookieValue.NLNU);
label label
.attr('title', NoticeDataGeo_text.ShareDisable + ' (' + cookieValue.NLN + ')') .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + cookieValue.NLN + ')')
.addClass('checked'); .addClass('checked');
} catch (e) {
console.log('Parsing error:', e);
}
} }
} else { } else {
removeNoticeDataGeo(); removeNoticeDataGeo();