diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-22 14:18:21 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-22 14:18:21 -0500 |
| commit | 29d83c8ca94201cb010b5aef564df78ab868ea0c (patch) | |
| tree | 8bc66e2fc03865e287a4c1907e766d6b4311c832 /js | |
| parent | 104d300799c0817bdbe893f08fd9b46d37a75a80 (diff) | |
| parent | 0e852def6ae5aa529cca0aef1187152fb5a880be (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'js')
| -rw-r--r-- | js/util.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/js/util.js b/js/util.js index 88016bd6d..a749c5d9f 100644 --- a/js/util.js +++ b/js/util.js @@ -205,8 +205,10 @@ var SN = { // StatusNet cookieValue = JSON.parse(cookieValue); NLat = $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat).val(); NLon = $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon).val(); - NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val(); - NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val(); + if ($('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)) { + NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val(); + NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val(); + } } if (cookieValue == 'disabled') { NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked'); @@ -301,8 +303,10 @@ var SN = { // StatusNet $('#'+SN.C.S.NoticeLat).val(NLat); $('#'+SN.C.S.NoticeLon).val(NLon); - $('#'+SN.C.S.NoticeLocationNs).val(NLNS); - $('#'+SN.C.S.NoticeLocationId).val(NLID); + if ($('#'+SN.C.S.NoticeLocationNs)) { + $('#'+SN.C.S.NoticeLocationNs).val(NLNS); + $('#'+SN.C.S.NoticeLocationId).val(NLID); + } $('#'+SN.C.S.NoticeDataGeo).attr('checked', NDG); } }); |