Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly

This commit is contained in:
Mikael Nordfeldth 2015-07-10 16:03:41 +02:00
commit a964ea61cd

View File

@ -1081,12 +1081,12 @@ var SN = { // StatusNet
label.attr('title', label.text()); label.attr('title', label.text());
check.change(function () { check.change(function () {
if (check.prop('checked') === true || $.cookie(SN.C.S.NoticeDataGeoCookie) === null) { if (check.prop('checked') === true || $.cookie(SN.C.S.NoticeDataGeoCookie) === undefined) {
label label
.attr('title', NoticeDataGeo_text.ShareDisable) .attr('title', NoticeDataGeo_text.ShareDisable)
.addClass('checked'); .addClass('checked');
if ($.cookie(SN.C.S.NoticeDataGeoCookie) === null || $.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') { if ($.cookie(SN.C.S.NoticeDataGeoCookie) === undefined || $.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') {
if (navigator.geolocation) { if (navigator.geolocation) {
SN.U.NoticeGeoStatus(form, 'Requesting location from browser...'); SN.U.NoticeGeoStatus(form, 'Requesting location from browser...');
navigator.geolocation.getCurrentPosition( navigator.geolocation.getCurrentPosition(
@ -1297,7 +1297,7 @@ var SN = { // StatusNet
* @fixme what is this? * @fixme what is this?
*/ */
Delete: function () { Delete: function () {
$.cookie(SN.C.S.StatusNetInstance, null); $.removeCookie(SN.C.S.StatusNetInstance);
} }
}, },