X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Futil.js;h=88016bd6d06c27c30848e88a12d3f55663562972;hb=2172114f8619491003b1291fe8e97c7e3e77dbb9;hp=f6b59ec742b8ed1aa6ff5b1bb2aaa29c0e2dd42f;hpb=de74c64490a028def7687cee40852e2072b0b5a8;p=quix0rs-gnu-social.git
diff --git a/js/util.js b/js/util.js
index f6b59ec742..88016bd6d0 100644
--- a/js/util.js
+++ b/js/util.js
@@ -51,9 +51,9 @@ var SN = { // StatusNet
NoticeLon: 'notice_data-lon',
NoticeLocationId: 'notice_data-location_id',
NoticeLocationNs: 'notice_data-location_ns',
- NoticeLocationName: 'notice_data-location_name',
- NoticeLocationCookieName: 'location_enabled',
+ NoticeGeoName: 'notice_data-geo_name',
NoticeDataGeo: 'notice_data-geo',
+ NoticeDataGeoCookie: 'notice_data-geo_cookie',
NoticeDataGeoSelected: 'notice_data-geo_selected'
}
},
@@ -178,12 +178,13 @@ var SN = { // StatusNet
},
FormNoticeXHR: function(form) {
+ var NDG, NLat, NLon, NLNS, NLID;
form_id = form.attr('id');
form.append('');
form.ajaxForm({
dataType: 'xml',
timeout: '60000',
- beforeSend: function(xhr) {
+ beforeSend: function(formData) {
if ($('#'+form_id+' #'+SN.C.S.NoticeDataText)[0].value.length === 0) {
form.addClass(SN.C.S.Warning);
return false;
@@ -191,6 +192,29 @@ var SN = { // StatusNet
form.addClass(SN.C.S.Processing);
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled);
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).attr(SN.C.S.Disabled, SN.C.S.Disabled);
+
+ NLat = $('#'+SN.C.S.NoticeLat).val();
+ NLon = $('#'+SN.C.S.NoticeLon).val();
+ NLNS = $('#'+SN.C.S.NoticeLocationNs).val();
+ NLID = $('#'+SN.C.S.NoticeLocationId).val();
+ NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked');
+
+ cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie);
+
+ if (cookieValue !== null && cookieValue != 'disabled') {
+ 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 (cookieValue == 'disabled') {
+ NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked');
+ }
+ else {
+ NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', true).attr('checked');
+ }
+
return true;
},
error: function (xhr, textStatus, errorThrown) {
@@ -265,6 +289,7 @@ var SN = { // StatusNet
}
}
$('#'+form_id).resetForm();
+ $('#'+form_id+' #'+SN.C.S.NoticeInReplyTo).val('');
$('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove();
SN.U.FormNoticeEnhancements($('#'+form_id));
}
@@ -273,6 +298,12 @@ var SN = { // StatusNet
form.removeClass(SN.C.S.Processing);
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled);
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled);
+
+ $('#'+SN.C.S.NoticeLat).val(NLat);
+ $('#'+SN.C.S.NoticeLon).val(NLon);
+ $('#'+SN.C.S.NoticeLocationNs).val(NLNS);
+ $('#'+SN.C.S.NoticeLocationId).val(NLID);
+ $('#'+SN.C.S.NoticeDataGeo).attr('checked', NDG);
}
});
},
@@ -442,105 +473,160 @@ var SN = { // StatusNet
},
NoticeLocationAttach: function() {
- var NDG = $('#'+SN.C.S.NoticeDataGeo);
- if (NDG.length > 0) {
- var NLE = $('#notice_data-location_wrap');
- var geocodeURL = NLE.attr('title');
-
- $('label[for=notice_data-geo]').attr('title', NLE.text());
-
- if (navigator.geolocation) {
- NDG.change(function() {
- NLE.removeAttr('title');
-
- $.cookie(SN.C.S.NoticeLocationCookieName, $('#'+SN.C.S.NoticeDataGeo).attr('checked'));
-
- var NLN = $('#'+SN.C.S.NoticeLocationName);
- if (NLN.length > 0) {
- NLN.remove();
- }
-
- var S = '';
- NDGS = $('#'+SN.C.S.NoticeDataGeoSelected);
- if (NDGS.length > 0) {
- NDGS.replaceWith(S);
- }
- else {
- $('#'+SN.C.S.FormNotice).append(S);
- }
- NDGS = $('#'+SN.C.S.NoticeDataGeoSelected);
- NDGS.prepend('Geo');
-
- NLN = $('#'+SN.C.S.NoticeLocationName);
-
- if ($('#'+SN.C.S.NoticeDataGeo).attr('checked') === true) {
- NLN.addClass('processing');
- $('label[for=notice_data-geo]').addClass('checked');
-
- NDGS.append(' ');
-
- $('#'+SN.C.S.NoticeDataGeoSelected+' button.close').click(function(){
- $('#'+SN.C.S.NoticeDataGeoSelected).remove();
- $('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
- $('label[for=notice_data-geo]').removeClass('checked');
-
- return false;
- });
+ var NLat = $('#'+SN.C.S.NoticeLat).val();
+ var NLon = $('#'+SN.C.S.NoticeLon).val();
+ var NLNS = $('#'+SN.C.S.NoticeLocationNs).val();
+ var NLID = $('#'+SN.C.S.NoticeLocationId).val();
+ var NLN = $('#'+SN.C.S.NoticeGeoName).text();
+ var NDGe = $('#'+SN.C.S.NoticeDataGeo);
+
+ function removeNoticeDataGeo() {
+ $('label[for='+SN.C.S.NoticeDataGeo+']')
+ .attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()))
+ .removeClass('checked');
+
+ $('#'+SN.C.S.NoticeLat).val('');
+ $('#'+SN.C.S.NoticeLon).val('');
+ $('#'+SN.C.S.NoticeLocationNs).val('');
+ $('#'+SN.C.S.NoticeLocationId).val('');
+ $('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
+
+ $.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled');
+ }
- $('#'+SN.C.S.NoticeDataGeoSelected+' button.minimize').click(function(){
- $('#'+SN.C.S.NoticeDataGeoSelected).hide();
+ function getJSONgeocodeURL(geocodeURL, data) {
+ $.getJSON(geocodeURL, data, function(location) {
+ var lns, lid;
- return false;
- });
+ if (typeof(location.location_ns) != 'undefined') {
+ $('#'+SN.C.S.NoticeLocationNs).val(location.location_ns);
+ lns = location.location_ns;
+ }
- navigator.geolocation.getCurrentPosition(function(position) {
- $('#'+SN.C.S.NoticeLat).val(position.coords.latitude);
- $('#'+SN.C.S.NoticeLon).val(position.coords.longitude);
+ if (typeof(location.location_id) != 'undefined') {
+ $('#'+SN.C.S.NoticeLocationId).val(location.location_id);
+ lid = location.location_id;
+ }
- var data = {
- 'lat': position.coords.latitude,
- 'lon': position.coords.longitude,
- 'token': $('#token').val()
- };
+ if (typeof(location.name) == 'undefined') {
+ NLN_text = position.coords.latitude + ';' + position.coords.longitude;
+ }
+ else {
+ NLN_text = location.name;
+ }
- $.getJSON(geocodeURL, data, function(location) {
- NLN.replaceWith('');
- NLN = $('#'+SN.C.S.NoticeLocationName);
+ $('label[for='+SN.C.S.NoticeDataGeo+']')
+ .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + NLN_text + ')');
+
+ $('#'+SN.C.S.NoticeLat).val(data.lat);
+ $('#'+SN.C.S.NoticeLon).val(data.lon);
+ $('#'+SN.C.S.NoticeLocationNs).val(lns);
+ $('#'+SN.C.S.NoticeLocationId).val(lid);
+ $('#'+SN.C.S.NoticeDataGeo).attr('checked', true);
+
+ var cookieValue = {
+ 'NLat': data.lat,
+ 'NLon': data.lon,
+ 'NLNS': lns,
+ 'NLID': lid,
+ 'NLN': NLN_text,
+ 'NLNU': location.url,
+ 'NDG': true
+ };
+ $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue));
+ });
+ }
- if (typeof(location.location_ns) != 'undefined') {
- $('#'+SN.C.S.NoticeLocationNs).val(location.location_ns);
- }
+ if (NDGe.length > 0) {
+ if ($.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') {
+ NDGe.attr('checked', false);
+ }
+ else {
+ NDGe.attr('checked', true);
+ }
- if (typeof(location.location_id) != 'undefined') {
- $('#'+SN.C.S.NoticeLocationId).val(location.location_id);
- }
+ var NGW = $('#notice_data-geo_wrap');
+ var geocodeURL = NGW.attr('title');
+ NGW.removeAttr('title');
+
+ $('label[for='+SN.C.S.NoticeDataGeo+']')
+ .attr('title', jQuery.trim($('label[for='+SN.C.S.NoticeDataGeo+']').text()));
+
+ NDGe.change(function() {
+ if ($('#'+SN.C.S.NoticeDataGeo).attr('checked') === true || $.cookie(SN.C.S.NoticeDataGeoCookie) === null) {
+ $('label[for='+SN.C.S.NoticeDataGeo+']')
+ .attr('title', NoticeDataGeo_text.ShareDisable)
+ .addClass('checked');
+
+ if ($.cookie(SN.C.S.NoticeDataGeoCookie) === null || $.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') {
+ if (navigator.geolocation) {
+ navigator.geolocation.getCurrentPosition(
+ function(position) {
+ $('#'+SN.C.S.NoticeLat).val(position.coords.latitude);
+ $('#'+SN.C.S.NoticeLon).val(position.coords.longitude);
+
+ var data = {
+ 'lat': position.coords.latitude,
+ 'lon': position.coords.longitude,
+ 'token': $('#token').val()
+ };
+
+ getJSONgeocodeURL(geocodeURL, data);
+ },
+
+ function(error) {
+ switch(error.code) {
+ case error.PERMISSION_DENIED:
+ removeNoticeDataGeo();
+ break;
+ case error.TIMEOUT:
+ $('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
+ break;
+ }
+ },
- if (typeof(location.name) == 'undefined') {
- NLN_text = position.coords.latitude + ';' + position.coords.longitude;
- }
- else {
- NLN_text = location.name;
+ {
+ timeout: 10000
}
-
- NLN.attr('href', location.url);
- NLN.text(NLN_text);
- });
- });
+ );
+ }
+ else {
+ if (NLat.length > 0 && NLon.length > 0) {
+ var data = {
+ 'lat': NLat,
+ 'lon': NLon,
+ 'token': $('#token').val()
+ };
+
+ getJSONgeocodeURL(geocodeURL, data);
+ }
+ else {
+ removeNoticeDataGeo();
+ $('#'+SN.C.S.NoticeDataGeo).remove();
+ $('label[for='+SN.C.S.NoticeDataGeo+']').remove();
+ }
+ }
}
else {
- $('label[for=notice_data-geo]').removeClass('checked');
- NDGS.hide();
- $('#'+SN.C.S.NoticeLat).val('');
- $('#'+SN.C.S.NoticeLon).val('');
- $('#'+SN.C.S.NoticeLocationNs).val('');
- $('#'+SN.C.S.NoticeLocationId).val('');
+ var cookieValue = JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));
+
+ $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat);
+ $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon);
+ $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS);
+ $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID);
+ $('#'+SN.C.S.NoticeDataGeo).attr('checked', cookieValue.NDG);
+
+ $('label[for='+SN.C.S.NoticeDataGeo+']')
+ .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + cookieValue.NLN + ')')
+ .addClass('checked');
}
- });
+ }
+ else {
+ removeNoticeDataGeo();
+ }
- var cookieVal = $.cookie(SN.C.S.NoticeLocationCookieName);
- NDG.attr('checked', (cookieVal == null || cookieVal == 'true'));
- NDG.change();
- }
+ $('#'+SN.C.S.NoticeDataText).focus();
+ }).change();
}
},
@@ -576,13 +662,14 @@ var SN = { // StatusNet
Init: {
NoticeForm: function() {
if ($('body.user_in').length > 0) {
+ SN.U.NoticeLocationAttach();
+
$('.'+SN.C.S.FormNotice).each(function() {
SN.U.FormNoticeXHR($(this));
SN.U.FormNoticeEnhancements($(this));
});
SN.U.NoticeDataAttach();
- SN.U.NoticeLocationAttach();
}
},