GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fixed regression from util.js updates + syntax cleanup

Browse Source 
We introduced a regression in 6fa9062d28713e81d508854fa232ce65a8a59319
based on syntax error, as a curly brace ({) was lost. This is now fixed.
This commit is contained in:
Mikael Nordfeldth 2013-09-10 15:14:42 +02:00
parent a56ad2c43d
commit a4d04d24de
2 changed files with 256 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
js/util.js
View File

@ -78,11 +78,10 @@ var SN = { // StatusNet
* @return matching localized message string * @return matching localized message string
*/ */
msg: function (key) { msg: function (key) {
if (typeof SN.messages[key] == "undefined") { if (SN.messages[key] === undefined) {
return '[' + key + ']'; return '[' + key + ']';
} else {
return SN.messages[key];
} }
return SN.messages[key];
}, },
U: { // Utils U: { // Utils
@ -96,15 +95,15 @@ var SN = { // StatusNet
*/ */
FormNoticeEnhancements: function (form) { FormNoticeEnhancements: function (form) {
if (jQuery.data(form[0], 'ElementData') === undefined) { if (jQuery.data(form[0], 'ElementData') === undefined) {
MaxLength = form.find('.count').text(); var MaxLength = form.find('.count').text();
if (typeof(MaxLength) == 'undefined') { if (MaxLength === undefined) {
MaxLength = SN.C.I.MaxLength; MaxLength = SN.C.I.MaxLength;
} }
jQuery.data(form[0], 'ElementData', {MaxLength: MaxLength}); jQuery.data(form[0], 'ElementData', {MaxLength: MaxLength});
SN.U.Counter(form); SN.U.Counter(form);
NDT = form.find('.notice_data-text:first'); var NDT = form.find('.notice_data-text:first');
NDT.on('keyup', function (e) { NDT.on('keyup', function (e) {
SN.U.Counter(form); SN.U.Counter(form);
@ -122,8 +121,7 @@ var SN = { // StatusNet
// Note there's still no event for mouse-triggered 'delete'. // Note there's still no event for mouse-triggered 'delete'.
NDT.on('cut', delayedUpdate) NDT.on('cut', delayedUpdate)
.on('paste', delayedUpdate); .on('paste', delayedUpdate);
} } else {
else {
form.find('.count').text(jQuery.data(form[0], 'ElementData').MaxLength); form.find('.count').text(jQuery.data(form[0], 'ElementData').MaxLength);
} }
}, },
@ -213,11 +211,10 @@ var SN = { // StatusNet
*/ */
RewriteAjaxAction: function (url) { RewriteAjaxAction: function (url) {
// Quick hack: rewrite AJAX submits to HTTPS if they'd fail otherwise. // Quick hack: rewrite AJAX submits to HTTPS if they'd fail otherwise.
if (document.location.protocol == 'https:' && url.substr(0, 5) == 'http:') { if (document.location.protocol === 'https:' && url.substr(0, 5) === 'http:') {
return url.replace(/^http:\/\/[^:\/]+/, 'https://' + document.location.host); return url.replace(/^http:\/\/[^:\/]+/, 'https://' + document.location.host);
} else {
return url;
} }
return url;
}, },
/** /**
@ -261,7 +258,7 @@ var SN = { // StatusNet
if (xhr.responseXML) { if (xhr.responseXML) {
errorReported = $('#error', xhr.responseXML).text(); errorReported = $('#error', xhr.responseXML).text();
} }
alert(errorReported || errorThrown || textStatus); window.alert(errorReported || errorThrown || textStatus);
// Restore the form to original state. // Restore the form to original state.
// Hopefully. :D // Hopefully. :D
@ -272,21 +269,19 @@ var SN = { // StatusNet
.prop(SN.C.S.Disabled, false); .prop(SN.C.S.Disabled, false);
}, },
success: function (data, textStatus) { success: function (data, textStatus) {
if (typeof($('form', data)[0]) != 'undefined') { if ($('form', data)[0] !== undefined) {
form_new = document._importNode($('form', data)[0], true); var form_new = document._importNode($('form', data)[0], true);
form.replaceWith(form_new); form.replaceWith(form_new);
if (onSuccess) { if (onSuccess) {
onSuccess(); onSuccess();
} }
} } else if ($('p', data)[0] !== undefined) {
else if (typeof($('p', data)[0]) != 'undefined') {
form.replaceWith(document._importNode($('p', data)[0], true)); form.replaceWith(document._importNode($('p', data)[0], true));
if (onSuccess) { if (onSuccess) {
onSuccess(); onSuccess();
} }
} } else {
else { window.alert('Unknown error.');
alert('Unknown error.');
} }
} }
}); });
@ -376,20 +371,17 @@ var SN = { // StatusNet
if (textStatus == 'timeout') { if (textStatus == 'timeout') {
// @fixme i18n // @fixme i18n
showFeedback('error', 'Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.'); showFeedback('error', 'Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.');
} } else {
else {
var response = SN.U.GetResponseXML(xhr); var response = SN.U.GetResponseXML(xhr);
if ($('.' + SN.C.S.Error, response).length > 0) { if ($('.' + SN.C.S.Error, response).length > 0) {
form.append(document._importNode($('.' + SN.C.S.Error, response)[0], true)); form.append(document._importNode($('.' + SN.C.S.Error, response)[0], true));
} } else {
else {
if (parseInt(xhr.status) === 0 || jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) >= 0) { if (parseInt(xhr.status) === 0 || jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) >= 0) {
form form
.resetForm() .resetForm()
.find('.attach-status').remove(); .find('.attach-status').remove();
SN.U.FormNoticeEnhancements(form); SN.U.FormNoticeEnhancements(form);
} } else {
else {
// @fixme i18n // @fixme i18n
showFeedback('error', '(Sorry! We had trouble sending your notice (' + xhr.status + ' ' + xhr.statusText + '). Please report the problem to the site administrator if this happens again.'); showFeedback('error', '(Sorry! We had trouble sending your notice (' + xhr.status + ' ' + xhr.statusText + '). Please report the problem to the site administrator if this happens again.');
} }
@ -401,8 +393,7 @@ var SN = { // StatusNet
var errorResult = $('#' + SN.C.S.Error, data); var errorResult = $('#' + SN.C.S.Error, data);
if (errorResult.length > 0) { if (errorResult.length > 0) {
showFeedback('error', errorResult.text()); showFeedback('error', errorResult.text());
} } else {
else {
if ($('body')[0].id == 'bookmarklet') { if ($('body')[0].id == 'bookmarklet') {
// @fixme self is not referenced anywhere? // @fixme self is not referenced anywhere?
self.close(); self.close();
@ -411,8 +402,7 @@ var SN = { // StatusNet
var commandResult = $('#' + SN.C.S.CommandResult, data); var commandResult = $('#' + SN.C.S.CommandResult, data);
if (commandResult.length > 0) { if (commandResult.length > 0) {
showFeedback('success', commandResult.text()); showFeedback('success', commandResult.text());
} } else {
else {
// New notice post was successful. If on our timeline, show it! // New notice post was successful. If on our timeline, show it!
var notice = document._importNode($('li', data)[0], true); var notice = document._importNode($('li', data)[0], true);
var notices = $('#notices_primary .notices:first'); var notices = $('#notices_primary .notices:first');
@ -425,11 +415,9 @@ var SN = { // StatusNet
replyItem.remove(); replyItem.remove();
var id = $(notice).attr('id'); var id = $(notice).attr('id');
if ($("#"+id).length == 0) { if ($('#' + id).length == 0) {
$(notice).insertBefore(placeholder); $(notice).insertBefore(placeholder);
} else { } // else Realtime came through before us...
// Realtime came through before us...
}
// ...and show the placeholder form. // ...and show the placeholder form.
placeholder.show(); placeholder.show();
@ -444,8 +432,7 @@ var SN = { // StatusNet
$(notice_irt).append('<ul class="notices"></ul>'); $(notice_irt).append('<ul class="notices"></ul>');
} }
$($(notice_irt + ' .notices')[0]).append(notice); $($(notice_irt + ' .notices')[0]).append(notice);
} } else {
else {
notices.prepend(notice); notices.prepend(notice);
} }
$('#' + notice.id) $('#' + notice.id)
@ -497,15 +484,14 @@ var SN = { // StatusNet
.prop(SN.C.S.Disabled, true); .prop(SN.C.S.Disabled, true);
}, },
error: function (xhr, textStatus, errorThrown) { error: function (xhr, textStatus, errorThrown) {
alert(errorThrown || textStatus); window.alert(errorThrown || textStatus);
}, },
success: function (data, textStatus) { success: function (data, textStatus) {
var results_placeholder = $('#profile_search_results'); var results_placeholder = $('#profile_search_results');
if (typeof($('ul', data)[0]) != 'undefined') { if ($('ul', data)[0] !== undefined) {
var list = document._importNode($('ul', data)[0], true); var list = document._importNode($('ul', data)[0], true);
results_placeholder.replaceWith(list); results_placeholder.replaceWith(list);
} } else {
else {
var _error = $('<li/>').append(document._importNode($('p', data)[0], true)); var _error = $('<li/>').append(document._importNode($('p', data)[0], true));
results_placeholder.html(_error); results_placeholder.html(_error);
} }
@ -531,11 +517,11 @@ var SN = { // StatusNet
.prop(SN.C.S.Disabled, true); .prop(SN.C.S.Disabled, true);
}, },
error: function (xhr, textStatus, errorThrown) { error: function (xhr, textStatus, errorThrown) {
alert(errorThrown || textStatus); window.alert(errorThrown || textStatus);
}, },
success: function (data, textStatus) { success: function (data, textStatus) {
var results_placeholder = form.parents('.entity_tags'); var results_placeholder = form.parents('.entity_tags');
if (typeof($('.entity_tags', data)[0]) != 'undefined') { if ($('.entity_tags', data)[0] !== undefined) {
var tags = document._importNode($('.entity_tags', data)[0], true); var tags = document._importNode($('.entity_tags', data)[0], true);
$(tags).find('.editable').append($('<button class="peopletags_edit_button"/>')); $(tags).find('.editable').append($('<button class="peopletags_edit_button"/>'));
results_placeholder.replaceWith(tags); results_placeholder.replaceWith(tags);
@ -574,8 +560,7 @@ var SN = { // StatusNet
} }
if (cookieValue == 'disabled') { if (cookieValue == 'disabled') {
SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').prop('checked', false).prop('checked'); SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').prop('checked', false).prop('checked');
} } else {
else {
SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').prop('checked', true).prop('checked'); SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').prop('checked', true).prop('checked');
} }
@ -637,6 +622,7 @@ var SN = { // StatusNet
NoticeInlineReplyTrigger: function (notice, initialText) { NoticeInlineReplyTrigger: function (notice, initialText) {
// Find the notice we're replying to... // Find the notice we're replying to...
var id = $($('.notice_id', notice)[0]).text(); var id = $($('.notice_id', notice)[0]).text();
var replyForm, placeholder;
var parentNotice = notice; var parentNotice = notice;
var stripForm = true; // strip a couple things out of reply forms that are inline var stripForm = true; // strip a couple things out of reply forms that are inline
@ -645,7 +631,7 @@ var SN = { // StatusNet
if (list.closest('.old-school').length) { if (list.closest('.old-school').length) {
// We're replying to an old-school conversation thread; // We're replying to an old-school conversation thread;
// use the old-style ping into the top form. // use the old-style ping into the top form.
SN.U.switchInputFormTab("status") SN.U.switchInputFormTab("status");
replyForm = $('#input_form_status').find('form'); replyForm = $('#input_form_status').find('form');
stripForm = false; stripForm = false;
} else if (list.hasClass('threaded-replies')) { } else if (list.hasClass('threaded-replies')) {
@ -654,7 +640,7 @@ var SN = { // StatusNet
parentNotice = list.closest('.notice'); parentNotice = list.closest('.notice');
// See if the form's already open... // See if the form's already open...
var replyForm = $('.notice-reply-form', list); replyForm = $('.notice-reply-form', list);
} else { } else {
// We're replying to a parent notice; pull its threaded list // We're replying to a parent notice; pull its threaded list
// and we'll add on the end of it. Will add if needed. // and we'll add on the end of it. Will add if needed.
@ -663,14 +649,14 @@ var SN = { // StatusNet
SN.U.NoticeInlineReplyPlaceholder(notice); SN.U.NoticeInlineReplyPlaceholder(notice);
list = $('ul.threaded-replies', notice); list = $('ul.threaded-replies', notice);
} else { } else {
var placeholder = $('li.notice-reply-placeholder', notice); placeholder = $('li.notice-reply-placeholder', notice);
if (placeholder.length == 0) { if (placeholder.length == 0) {
SN.U.NoticeInlineReplyPlaceholder(notice); SN.U.NoticeInlineReplyPlaceholder(notice);
} }
} }
// See if the form's already open... // See if the form's already open...
var replyForm = $('.notice-reply-form', list); replyForm = $('.notice-reply-form', list);
} }
var nextStep = function () { var nextStep = function () {
@ -693,8 +679,8 @@ var SN = { // StatusNet
if (initialText) { if (initialText) {
replyto = initialText + ' '; replyto = initialText + ' ';
} }
text.val(replyto + text.val().replace(RegExp(replyto, 'i'), '')); text.val(replyto + text.val().replace(new RegExp(replyto, 'i'), ''));
text.data('initialText', $.trim(initialText + '')); text.data('initialText', $.trim(initialText));
text.focus(); text.focus();
if (text[0].setSelectionRange) { if (text[0].setSelectionRange) {
var len = text.val().length; var len = text.val().length;
@ -706,7 +692,7 @@ var SN = { // StatusNet
nextStep(); nextStep();
} else { } else {
// Hide the placeholder... // Hide the placeholder...
var placeholder = list.find('li.notice-reply-placeholder').hide(); placeholder = list.find('li.notice-reply-placeholder').hide();
// Create the reply form entry at the end // Create the reply form entry at the end
var replyItem = $('li.notice-reply', list); var replyItem = $('li.notice-reply', list);
@ -718,7 +704,8 @@ var SN = { // StatusNet
replyItem.append(formEl); replyItem.append(formEl);
list.append(replyItem); // *after* the placeholder list.append(replyItem); // *after* the placeholder
var form = replyForm = $(formEl); var form = $(formEl);
replyForm = form;
SN.Init.NoticeFormSetup(form); SN.Init.NoticeFormSetup(form);
nextStep(); nextStep();
@ -904,6 +891,7 @@ var SN = { // StatusNet
* @param {jQuery} form * @param {jQuery} form
*/ */
NoticeDataAttach: function (form) { NoticeDataAttach: function (form) {
var i;
var NDA = form.find('input[type=file]'); var NDA = form.find('input[type=file]');
NDA.change(function (event) { NDA.change(function (event) {
form.find('.attach-status').remove(); form.find('.attach-status').remove();
@ -924,9 +912,9 @@ var SN = { // StatusNet
}); });
form.append(attachStatus); form.append(attachStatus);
if (typeof this.files == "object") { if (typeof this.files === "object") {
// Some newer browsers will let us fetch the files for preview. // Some newer browsers will let us fetch the files for preview.
for (var i = 0; i < this.files.length; i++) { for (i = 0; i < this.files.length; i++) {
SN.U.PreviewAttach(form, this.files[i]); SN.U.PreviewAttach(form, this.files[i]);
} }
} }
@ -944,9 +932,8 @@ var SN = { // StatusNet
var max = $(form).find('input[name=MAX_FILE_SIZE]').attr('value'); var max = $(form).find('input[name=MAX_FILE_SIZE]').attr('value');
if (max) { if (max) {
return parseInt(max); return parseInt(max);
} else {
return 0;
} }
return 0;
}, },
/** /**
@ -975,7 +962,7 @@ var SN = { // StatusNet
var preview = true; var preview = true;
var blobAsDataURL; var blobAsDataURL;
if (typeof window.createObjectURL != "undefined") { if (window.createObjectURL !== undefined) {
/** /**
* createObjectURL lets us reference the file directly from an <img> * createObjectURL lets us reference the file directly from an <img>
* This produces a compact URL with an opaque reference to the file, * This produces a compact URL with an opaque reference to the file,
@ -988,8 +975,8 @@ var SN = { // StatusNet
*/ */
blobAsDataURL = function (blob, callback) { blobAsDataURL = function (blob, callback) {
callback(window.createObjectURL(blob)); callback(window.createObjectURL(blob));
} };
} else if (typeof window.FileReader != "undefined") { } else if (window.FileReader !== undefined) {
/** /**
* FileAPI's FileReader can build a data URL from a blob's contents, * FileAPI's FileReader can build a data URL from a blob's contents,
* but it must read the file and build it asynchronously. This means * but it must read the file and build it asynchronously. This means
@ -1004,9 +991,9 @@ var SN = { // StatusNet
var reader = new FileReader(); var reader = new FileReader();
reader.onload = function (event) { reader.onload = function (event) {
callback(reader.result); callback(reader.result);
} };
reader.readAsDataURL(blob); reader.readAsDataURL(blob);
} };
} else { } else {
preview = false; preview = false;
} }
@ -1054,8 +1041,8 @@ var SN = { // StatusNet
*/ */
NoticeLocationAttach: function (form) { NoticeLocationAttach: function (form) {
// @fixme this should not be tied to the main notice form, as there may be multiple notice forms... // @fixme this should not be tied to the main notice form, as there may be multiple notice forms...
var NLat = form.find('[name=lat]') var NLat = form.find('[name=lat]');
var NLon = form.find('[name=lon]') var NLon = form.find('[name=lon]');
var NLNS = form.find('[name=location_ns]').val(); var NLNS = form.find('[name=location_ns]').val();
var NLID = form.find('[name=location_id]').val(); var NLID = form.find('[name=location_id]').val();
var NLN = ''; // @fixme var NLN = ''; // @fixme
@ -1087,22 +1074,21 @@ var SN = { // StatusNet
function getJSONgeocodeURL(geocodeURL, data) { function getJSONgeocodeURL(geocodeURL, data) {
SN.U.NoticeGeoStatus(form, 'Looking up place name...'); SN.U.NoticeGeoStatus(form, 'Looking up place name...');
$.getJSON(geocodeURL, data, function (location) { $.getJSON(geocodeURL, data, function (location) {
var lns, lid; var lns, lid, NLN_text;
if (typeof(location.location_ns) != 'undefined') { if (location.location_ns !== undefined) {
form.find('[name=location_ns]').val(location.location_ns); form.find('[name=location_ns]').val(location.location_ns);
lns = location.location_ns; lns = location.location_ns;
} }
if (typeof(location.location_id) != 'undefined') { if (location.location_id !== undefined) {
form.find('[name=location_id]').val(location.location_id); form.find('[name=location_id]').val(location.location_id);
lid = location.location_id; lid = location.location_id;
} }
if (typeof(location.name) == 'undefined') { if (location.name === undefined) {
NLN_text = data.lat + ';' + data.lon; NLN_text = data.lat + ';' + data.lon;
} } else {
else {
NLN_text = location.name; NLN_text = location.name;
} }
@ -1133,19 +1119,17 @@ var SN = { // StatusNet
if (check.length > 0) { if (check.length > 0) {
if ($.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') { if ($.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') {
check.prop('checked', false); check.prop('checked', false);
} } else {
else {
check.prop('checked', true); check.prop('checked', true);
} }
var NGW = form.find('.notice_data-geo_wrap'); var NGW = form.find('.notice_data-geo_wrap');
var geocodeURL = NGW.attr('data-api'); var geocodeURL = NGW.attr('data-api');
label label.attr('title', label.text());
.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) === null) {
label label
.attr('title', NoticeDataGeo_text.ShareDisable) .attr('title', NoticeDataGeo_text.ShareDisable)
.addClass('checked'); .addClass('checked');
@ -1183,8 +1167,7 @@ var SN = { // StatusNet
timeout: 10000 timeout: 10000
} }
); );
} } else {
else {
if (NLat.length > 0 && NLon.length > 0) { if (NLat.length > 0 && NLon.length > 0) {
var data = { var data = {
lat: NLat, lat: NLat,
@ -1193,15 +1176,13 @@ var SN = { // StatusNet
}; };
getJSONgeocodeURL(geocodeURL, data); getJSONgeocodeURL(geocodeURL, data);
} } else {
else {
removeNoticeDataGeo(); removeNoticeDataGeo();
check.remove(); check.remove();
label.remove(); label.remove();
} }
} }
} } else {
else {
var cookieValue = JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie)); var cookieValue = JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));
form.find('[name=lat]').val(cookieValue.NLat); form.find('[name=lat]').val(cookieValue.NLat);
@ -1215,8 +1196,7 @@ var SN = { // StatusNet
.attr('title', NoticeDataGeo_text.ShareDisable + ' (' + cookieValue.NLN + ')') .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + cookieValue.NLN + ')')
.addClass('checked'); .addClass('checked');
} }
} } else {
else {
removeNoticeDataGeo(); removeNoticeDataGeo();
} }
}).change(); }).change();
@ -1291,8 +1271,7 @@ var SN = { // StatusNet
}); });
NDM.removeClass(SN.C.S.Processing); NDM.removeClass(SN.C.S.Processing);
}); });
} } else {
else {
NDMF.show(); NDMF.show();
$('.entity_send-a-message textarea').focus(); $('.entity_send-a-message textarea').focus();
} }
@ -1719,7 +1698,7 @@ var SN = { // StatusNet
*/ */
UploadForms: function () { UploadForms: function () {
$('input[type=file]').change(function (event) { $('input[type=file]').change(function (event) {
if (typeof this.files == "object" && this.files.length > 0) { if (typeof this.files === "object" && this.files.length > 0) {
var size = 0; var size = 0;
for (var i = 0; i < this.files.length; i++) { for (var i = 0; i < this.files.length; i++) {
size += this.files[i].size; size += this.files[i].size;

2
js/util.min.js vendored
View File

File diff suppressed because one or more lines are too long