Some JS cleaning up for NoticeLocationAttach (which fixes also fixes a
few bugs in WebKit)
This commit is contained in:
parent
0f3658d3da
commit
c367e09d11
14
js/util.js
14
js/util.js
@ -498,7 +498,7 @@ var SN = { // StatusNet
|
|||||||
$.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled');
|
$.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled');
|
||||||
}
|
}
|
||||||
|
|
||||||
function getJSONgeocodeURL(geocodeURL, data, position) {
|
function getJSONgeocodeURL(geocodeURL, data) {
|
||||||
$.getJSON(geocodeURL, data, function(location) {
|
$.getJSON(geocodeURL, data, function(location) {
|
||||||
var lns, lid;
|
var lns, lid;
|
||||||
|
|
||||||
@ -513,7 +513,7 @@ var SN = { // StatusNet
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (typeof(location.name) == 'undefined') {
|
if (typeof(location.name) == 'undefined') {
|
||||||
NLN_text = position.coords.latitude + ';' + position.coords.longitude;
|
NLN_text = data.lat + ';' + data.lon;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
NLN_text = location.name;
|
NLN_text = location.name;
|
||||||
@ -575,7 +575,7 @@ var SN = { // StatusNet
|
|||||||
token: $('#token').val()
|
token: $('#token').val()
|
||||||
};
|
};
|
||||||
|
|
||||||
getJSONgeocodeURL(geocodeURL, data, position);
|
getJSONgeocodeURL(geocodeURL, data);
|
||||||
},
|
},
|
||||||
|
|
||||||
function(error) {
|
function(error) {
|
||||||
@ -597,12 +597,12 @@ var SN = { // StatusNet
|
|||||||
else {
|
else {
|
||||||
if (NLat.length > 0 && NLon.length > 0) {
|
if (NLat.length > 0 && NLon.length > 0) {
|
||||||
var data = {
|
var data = {
|
||||||
'lat': NLat,
|
lat: NLat,
|
||||||
'lon': NLon,
|
lon: NLon,
|
||||||
'token': $('#token').val()
|
token: $('#token').val()
|
||||||
};
|
};
|
||||||
|
|
||||||
getJSONgeocodeURL(geocodeURL, data, position);
|
getJSONgeocodeURL(geocodeURL, data);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
removeNoticeDataGeo();
|
removeNoticeDataGeo();
|
||||||
|
Loading…
Reference in New Issue
Block a user