X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=js%2Futil.js;h=c3ca213f3a4287a103c4baa9e63b73605cee586a;hb=3f9a16dc587b86b8912bc5a00dd1800c6475f73d;hp=ee5cbefd8819796985cf58ddd8a0e8612f829922;hpb=ced00cf0bdd4f119e2126e2eba18a3df7ee45c11;p=quix0rs-gnu-social.git
diff --git a/js/util.js b/js/util.js
index ee5cbefd88..c3ca213f3a 100644
--- a/js/util.js
+++ b/js/util.js
@@ -54,7 +54,7 @@ var SN = { // StatusNet
NoticeDataGeo: 'notice_data-geo',
NoticeDataGeoCookie: 'NoticeDataGeo',
NoticeDataGeoSelected: 'notice_data-geo_selected',
- StatusNetInstance:'StatusNetInstance'
+ StatusNetInstance: 'StatusNetInstance'
}
},
@@ -77,12 +77,11 @@ var SN = { // StatusNet
* @param {String} key: string key name to pull from message index
* @return matching localized message string
*/
- msg: function(key) {
- if (typeof SN.messages[key] == "undefined") {
+ msg: function (key) {
+ if (SN.messages[key] === undefined) {
return '[' + key + ']';
- } else {
- return SN.messages[key];
}
+ return SN.messages[key];
},
U: { // Utils
@@ -94,36 +93,35 @@ var SN = { // StatusNet
* @param {jQuery} form: jQuery object whose first matching element is the form
* @access private
*/
- FormNoticeEnhancements: function(form) {
+ FormNoticeEnhancements: function (form) {
if (jQuery.data(form[0], 'ElementData') === undefined) {
- MaxLength = form.find('.count').text();
- if (typeof(MaxLength) == 'undefined') {
- MaxLength = SN.C.I.MaxLength;
+ var MaxLength = form.find('.count').text();
+ if (MaxLength === undefined) {
+ MaxLength = SN.C.I.MaxLength;
}
- jQuery.data(form[0], 'ElementData', {MaxLength:MaxLength});
+ jQuery.data(form[0], 'ElementData', {MaxLength: MaxLength});
SN.U.Counter(form);
- NDT = form.find('.notice_data-text:first');
+ var NDT = form.find('.notice_data-text:first');
- NDT.bind('keyup', function(e) {
+ NDT.on('keyup', function (e) {
SN.U.Counter(form);
});
- var delayedUpdate= function(e) {
+ var delayedUpdate = function (e) {
// Cut and paste events fire *before* the operation,
// so we need to trigger an update in a little bit.
// This would be so much easier if the 'change' event
// actually fired every time the value changed. :P
- window.setTimeout(function() {
+ window.setTimeout(function () {
SN.U.Counter(form);
}, 50);
};
// Note there's still no event for mouse-triggered 'delete'.
- NDT.bind('cut', delayedUpdate)
- .bind('paste', delayedUpdate);
- }
- else {
+ NDT.on('cut', delayedUpdate)
+ .on('paste', delayedUpdate);
+ } else {
form.find('.count').text(jQuery.data(form[0], 'ElementData').MaxLength);
}
},
@@ -142,7 +140,7 @@ var SN = { // StatusNet
* @param {jQuery} form: jQuery object whose first element is the notice posting form
* @access private
*/
- Counter: function(form) {
+ Counter: function (form) {
SN.C.I.FormNoticeCurrent = form;
var MaxLength = jQuery.data(form[0], 'ElementData').MaxLength;
@@ -182,7 +180,7 @@ var SN = { // StatusNet
* @param {jQuery} form: jQuery object whose first element is the notice posting form
* @return number of chars
*/
- CharacterCount: function(form) {
+ CharacterCount: function (form) {
return form.find('.notice_data-text:first').val().length;
},
@@ -193,7 +191,7 @@ var SN = { // StatusNet
* @param {jQuery} form: jQuery object whose first element is the notice posting form
* @access private
*/
- ClearCounterBlackout: function(form) {
+ ClearCounterBlackout: function (form) {
// Allow keyup events to poke the counter again
SN.C.I.CounterBlackout = false;
// Check if the string changed since we last looked
@@ -211,13 +209,12 @@ var SN = { // StatusNet
* @param {String} url
* @return string
*/
- RewriteAjaxAction: function(url) {
+ RewriteAjaxAction: function (url) {
// 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);
- } else {
- return url;
}
+ return url;
},
/**
@@ -236,21 +233,22 @@ var SN = { // StatusNet
* @fixme can't submit file uploads
*
* @param {jQuery} form: jQuery object whose first element is a form
+ * @param function onSuccess: something extra to do on success
*
* @access public
*/
- FormXHR: function(form) {
+ FormXHR: function (form, onSuccess) {
$.ajax({
type: 'POST',
dataType: 'xml',
url: SN.U.RewriteAjaxAction(form.attr('action')),
data: form.serialize() + '&ajax=1',
- beforeSend: function(xhr) {
+ beforeSend: function (xhr) {
form
.addClass(SN.C.S.Processing)
.find('.submit')
.addClass(SN.C.S.Disabled)
- .attr(SN.C.S.Disabled, SN.C.S.Disabled);
+ .prop(SN.C.S.Disabled, true);
},
error: function (xhr, textStatus, errorThrown) {
// If the server end reported an error from StatusNet,
@@ -260,26 +258,30 @@ var SN = { // StatusNet
if (xhr.responseXML) {
errorReported = $('#error', xhr.responseXML).text();
}
- alert(errorReported || errorThrown || textStatus);
-
+ window.alert(errorReported || errorThrown || textStatus);
+
// Restore the form to original state.
// Hopefully. :D
form
.removeClass(SN.C.S.Processing)
.find('.submit')
.removeClass(SN.C.S.Disabled)
- .removeAttr(SN.C.S.Disabled);
+ .prop(SN.C.S.Disabled, false);
},
- success: function(data, textStatus) {
- if (typeof($('form', data)[0]) != 'undefined') {
- form_new = document._importNode($('form', data)[0], true);
+ success: function (data, textStatus) {
+ if ($('form', data)[0] !== undefined) {
+ var form_new = document._importNode($('form', data)[0], true);
form.replaceWith(form_new);
- }
- else if (typeof($('p', data)[0]) != 'undefined') {
+ if (onSuccess) {
+ onSuccess();
+ }
+ } else if ($('p', data)[0] !== undefined) {
form.replaceWith(document._importNode($('p', data)[0], true));
- }
- else {
- alert('Unknown error.');
+ if (onSuccess) {
+ onSuccess();
+ }
+ } else {
+ window.alert('Unknown error.');
}
}
});
@@ -306,13 +308,12 @@ var SN = { // StatusNet
* @fixme cookieValue is a global variable, but probably shouldn't be
* @fixme saving the location cache cookies should be split out
* @fixme some error messages are hardcoded english: needs i18n
- * @fixme special-case for bookmarklet is confusing and uses a global var "self". Is this ok?
*
* @param {jQuery} form: jQuery object whose first element is a form
*
* @access public
*/
- FormNoticeXHR: function(form) {
+ FormNoticeXHR: function (form) {
SN.C.I.NoticeDataGeo = {};
form.append('');
@@ -326,7 +327,7 @@ var SN = { // StatusNet
* @param {String} text
* @access private
*/
- var showFeedback = function(cls, text) {
+ var showFeedback = function (cls, text) {
form.append(
$('
')
.addClass(cls)
@@ -337,14 +338,14 @@ var SN = { // StatusNet
/**
* Hide the previous response feedback, if any.
*/
- var removeFeedback = function() {
+ var removeFeedback = function () {
form.find('.form_response').remove();
};
form.ajaxForm({
dataType: 'xml',
timeout: '60000',
- beforeSend: function(formData) {
+ beforeSend: function (formData) {
if (form.find('.notice_data-text:first').val() == '') {
form.addClass(SN.C.S.Warning);
return false;
@@ -353,7 +354,7 @@ var SN = { // StatusNet
.addClass(SN.C.S.Processing)
.find('.submit')
.addClass(SN.C.S.Disabled)
- .attr(SN.C.S.Disabled, SN.C.S.Disabled);
+ .prop(SN.C.S.Disabled, true);
SN.U.normalizeGeoData(form);
@@ -364,48 +365,38 @@ var SN = { // StatusNet
.removeClass(SN.C.S.Processing)
.find('.submit')
.removeClass(SN.C.S.Disabled)
- .removeAttr(SN.C.S.Disabled, SN.C.S.Disabled);
+ .prop(SN.C.S.Disabled, false);
removeFeedback();
if (textStatus == 'timeout') {
// @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.');
- }
- else {
+ } else {
var response = SN.U.GetResponseXML(xhr);
- if ($('.'+SN.C.S.Error, response).length > 0) {
- form.append(document._importNode($('.'+SN.C.S.Error, response)[0], true));
- }
- else {
+ if ($('.' + SN.C.S.Error, response).length > 0) {
+ form.append(document._importNode($('.' + SN.C.S.Error, response)[0], true));
+ } else {
if (parseInt(xhr.status) === 0 || jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) >= 0) {
form
.resetForm()
.find('.attach-status').remove();
SN.U.FormNoticeEnhancements(form);
- }
- else {
+ } else {
// @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.');
}
}
}
},
- success: function(data, textStatus) {
+ success: function (data, textStatus) {
removeFeedback();
- var errorResult = $('#'+SN.C.S.Error, data);
+ var errorResult = $('#' + SN.C.S.Error, data);
if (errorResult.length > 0) {
showFeedback('error', errorResult.text());
- }
- else {
- if($('body')[0].id == 'bookmarklet') {
- // @fixme self is not referenced anywhere?
- self.close();
- }
-
- var commandResult = $('#'+SN.C.S.CommandResult, data);
+ } else {
+ var commandResult = $('#' + SN.C.S.CommandResult, data);
if (commandResult.length > 0) {
showFeedback('success', commandResult.text());
- }
- else {
+ } else {
// New notice post was successful. If on our timeline, show it!
var notice = document._importNode($('li', data)[0], true);
var notices = $('#notices_primary .notices:first');
@@ -418,33 +409,30 @@ var SN = { // StatusNet
replyItem.remove();
var id = $(notice).attr('id');
- if ($("#"+id).length == 0) {
+ if ($('#' + id).length == 0) {
$(notice).insertBefore(placeholder);
- } else {
- // Realtime came through before us...
- }
+ } // else Realtime came through before us...
// ...and show the placeholder form.
placeholder.show();
} else if (notices.length > 0 && SN.U.belongsOnTimeline(notice)) {
// Not a reply. If on our timeline, show it at the top!
- if ($('#'+notice.id).length === 0) {
+ if ($('#' + notice.id).length === 0) {
var notice_irt_value = form.find('[name=inreplyto]').val();
- var notice_irt = '#notices_primary #notice-'+notice_irt_value;
- if($('body')[0].id == 'conversation') {
- if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) {
+ var notice_irt = '#notices_primary #notice-' + notice_irt_value;
+ if ($('body')[0].id == 'conversation') {
+ if (notice_irt_value.length > 0 && $(notice_irt + ' .notices').length < 1) {
$(notice_irt).append('
');
}
- $($(notice_irt+' .notices')[0]).append(notice);
- }
- else {
+ $($(notice_irt + ' .notices')[0]).append(notice);
+ } else {
notices.prepend(notice);
}
- $('#'+notice.id)
- .css({display:'none'})
+ $('#' + notice.id)
+ .css({display: 'none'})
.fadeIn(2500);
- SN.U.NoticeWithAttachment($('#'+notice.id));
+ SN.U.NoticeWithAttachment($('#' + notice.id));
SN.U.switchInputFormTab("placeholder");
}
} else {
@@ -460,75 +448,74 @@ var SN = { // StatusNet
SN.U.FormNoticeEnhancements(form);
}
},
- complete: function(xhr, textStatus) {
+ complete: function (xhr, textStatus) {
form
.removeClass(SN.C.S.Processing)
.find('.submit')
- .removeAttr(SN.C.S.Disabled)
+ .prop(SN.C.S.Disabled, false)
.removeClass(SN.C.S.Disabled);
form.find('[name=lat]').val(SN.C.I.NoticeDataGeo.NLat);
form.find('[name=lon]').val(SN.C.I.NoticeDataGeo.NLon);
form.find('[name=location_ns]').val(SN.C.I.NoticeDataGeo.NLNS);
form.find('[name=location_id]').val(SN.C.I.NoticeDataGeo.NLID);
- form.find('[name=notice_data-geo]').attr('checked', SN.C.I.NoticeDataGeo.NDG);
+ form.find('[name=notice_data-geo]').prop('checked', SN.C.I.NoticeDataGeo.NDG);
}
});
},
- FormProfileSearchXHR: function(form) {
+ FormProfileSearchXHR: function (form) {
$.ajax({
type: 'POST',
dataType: 'xml',
url: form.attr('action'),
data: form.serialize() + '&ajax=1',
- beforeSend: function(xhr) {
+ beforeSend: function (xhr) {
form
.addClass(SN.C.S.Processing)
.find('.submit')
.addClass(SN.C.S.Disabled)
- .attr(SN.C.S.Disabled, SN.C.S.Disabled);
+ .prop(SN.C.S.Disabled, true);
},
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');
- if (typeof($('ul', data)[0]) != 'undefined') {
+ if ($('ul', data)[0] !== undefined) {
var list = document._importNode($('ul', data)[0], true);
results_placeholder.replaceWith(list);
- }
- else {
- var _error = $('').append(document._importNode($('p', data)[0], true));
+ } else {
+ var _error = $('').append(document._importNode($('p', data)[0], true));
results_placeholder.html(_error);
}
form
.removeClass(SN.C.S.Processing)
.find('.submit')
.removeClass(SN.C.S.Disabled)
- .attr(SN.C.S.Disabled, false);
+ .prop(SN.C.S.Disabled, false);
}
});
},
- FormPeopletagsXHR: function(form) {
+ FormPeopletagsXHR: function (form) {
$.ajax({
type: 'POST',
dataType: 'xml',
url: form.attr('action'),
data: form.serialize() + '&ajax=1',
- beforeSend: function(xhr) {
- form.addClass(SN.C.S.Processing)
- .find('.submit')
+ beforeSend: function (xhr) {
+ form.find('.submit')
+ .addClass(SN.C.S.Processing)
.addClass(SN.C.S.Disabled)
- .attr(SN.C.S.Disabled, SN.C.S.Disabled);
+ .prop(SN.C.S.Disabled, true);
},
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');
- if (typeof($('.entity_tags', data)[0]) != 'undefined') {
+ if ($('.entity_tags', data)[0] !== undefined) {
var tags = document._importNode($('.entity_tags', data)[0], true);
$(tags).find('.editable').append($(''));
results_placeholder.replaceWith(tags);
@@ -538,22 +525,22 @@ var SN = { // StatusNet
form.removeClass(SN.C.S.Processing)
.find('.submit')
.removeClass(SN.C.S.Disabled)
- .attr(SN.C.S.Disabled, false);
+ .prop(SN.C.S.Disabled, false);
}
}
});
},
- normalizeGeoData: function(form) {
+ normalizeGeoData: function (form) {
SN.C.I.NoticeDataGeo.NLat = form.find('[name=lat]').val();
SN.C.I.NoticeDataGeo.NLon = form.find('[name=lon]').val();
SN.C.I.NoticeDataGeo.NLNS = form.find('[name=location_ns]').val();
SN.C.I.NoticeDataGeo.NLID = form.find('[name=location_id]').val();
- SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').attr('checked'); // @fixme
+ SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').prop('checked'); // @fixme (does this still need to be fixed somehow?)
var cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie);
- if (cookieValue !== null && cookieValue != 'disabled') {
+ if (cookieValue !== undefined && cookieValue != 'disabled') {
cookieValue = JSON.parse(cookieValue);
SN.C.I.NoticeDataGeo.NLat = form.find('[name=lat]').val(cookieValue.NLat).val();
SN.C.I.NoticeDataGeo.NLon = form.find('[name=lon]').val(cookieValue.NLon).val();
@@ -566,10 +553,9 @@ var SN = { // StatusNet
}
}
if (cookieValue == 'disabled') {
- SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').attr('checked', false).attr('checked');
- }
- else {
- SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').attr('checked', true).attr('checked');
+ SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').prop('checked', false).prop('checked');
+ } else {
+ SN.C.I.NoticeDataGeo.NDG = form.find('[name=notice_data-geo]').prop('checked', true).prop('checked');
}
},
@@ -584,7 +570,7 @@ var SN = { // StatusNet
* @param {XMLHTTPRequest} xhr
* @return DOMDocument
*/
- GetResponseXML: function(xhr) {
+ GetResponseXML: function (xhr) {
try {
return xhr.responseXML;
} catch (e) {
@@ -605,12 +591,11 @@ var SN = { // StatusNet
*
* @access private
*/
- NoticeReply: function() {
- $('#content .notice_reply').live('click', function(e) {
+ NoticeReply: function () {
+ $(document).on('click', '#content .notice_reply', function (e) {
e.preventDefault();
var notice = $(this).closest('li.notice');
- var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
- SN.U.NoticeInlineReplyTrigger(notice, '@' + nickname.text());
+ SN.U.NoticeInlineReplyTrigger(notice);
return false;
});
},
@@ -619,7 +604,7 @@ var SN = { // StatusNet
* Stub -- kept for compat with plugins for now.
* @access private
*/
- NoticeReplyTo: function(notice) {
+ NoticeReplyTo: function (notice) {
},
/**
@@ -628,33 +613,56 @@ var SN = { // StatusNet
* @param {jQuery} notice: jQuery object containing one notice
* @param {String} initialText
*/
- NoticeInlineReplyTrigger: function(notice, initialText) {
+ NoticeInlineReplyTrigger: function (notice, initialText) {
// Find the notice we're replying to...
var id = $($('.notice_id', notice)[0]).text();
+ var replyForm, placeholder;
var parentNotice = notice;
+ var stripForm = true; // strip a couple things out of reply forms that are inline
// Find the threaded replies view we'll be adding to...
var list = notice.closest('.notices');
- if (list.hasClass('threaded-replies')) {
+ if (list.closest('.old-school').length) {
+ // We're replying to an old-school conversation thread;
+ // use the old-style ping into the top form.
+ SN.U.switchInputFormTab("status");
+ replyForm = $('#input_form_status').find('form');
+ stripForm = false;
+ } else if (list.hasClass('threaded-replies')) {
// We're replying to a reply; use reply form on the end of this list.
// We'll add our form at the end of this; grab the root notice.
parentNotice = list.closest('.notice');
+
+ // See if the form's already open...
+ replyForm = $('.notice-reply-form', list);
} else {
// We're replying to a parent notice; pull its threaded list
// and we'll add on the end of it. Will add if needed.
list = $('ul.threaded-replies', notice);
if (list.length == 0) {
- list = $('
');
- notice.append(list);
+ SN.U.NoticeInlineReplyPlaceholder(notice);
+ list = $('ul.threaded-replies', notice);
+ } else {
+ placeholder = $('li.notice-reply-placeholder', notice);
+ if (placeholder.length == 0) {
+ SN.U.NoticeInlineReplyPlaceholder(notice);
+ }
}
- }
- // See if the form's already open...
- var replyForm = $('.notice-reply-form', list);
+ // See if the form's already open...
+ replyForm = $('.notice-reply-form', list);
+ }
- var nextStep = function() {
+ var nextStep = function () {
// Override...?
replyForm.find('input[name=inreplyto]').val(id);
+ if (stripForm) {
+ // Don't do this for old-school reply form, as they don't come back!
+ replyForm.find('#notice_to').prop('disabled', true).hide();
+ replyForm.find('#notice_private').prop('disabled', true).hide();
+ replyForm.find('label[for=notice_to]').hide();
+ replyForm.find('label[for=notice_private]').hide();
+ }
// Set focus...
var text = replyForm.find('textarea');
@@ -665,12 +673,12 @@ var SN = { // StatusNet
if (initialText) {
replyto = initialText + ' ';
}
- text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
- text.data('initialText', $.trim(initialText + ''));
+ text.val(replyto + text.val().replace(new RegExp(replyto, 'i'), ''));
+ text.data('initialText', $.trim(initialText));
text.focus();
if (text[0].setSelectionRange) {
var len = text.val().length;
- text[0].setSelectionRange(len,len);
+ text[0].setSelectionRange(len, len);
}
};
if (replyForm.length > 0) {
@@ -678,19 +686,20 @@ var SN = { // StatusNet
nextStep();
} else {
// 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
var replyItem = $('li.notice-reply', list);
if (replyItem.length == 0) {
replyItem = $('');
- var intermediateStep = function(formMaster) {
+ var intermediateStep = function (formMaster) {
var formEl = document._importNode(formMaster, true);
replyItem.append(formEl);
list.append(replyItem); // *after* the placeholder
- var form = replyForm = $(formEl);
+ var form = $(formEl);
+ replyForm = form;
SN.Init.NoticeFormSetup(form);
nextStep();
@@ -704,7 +713,7 @@ var SN = { // StatusNet
// Warning: this can have a delay, which looks bad.
// @fixme this fallback may or may not work
var url = $('#form_notice').attr('action');
- $.get(url, {ajax: 1}, function(data, textStatus, xhr) {
+ $.get(url, {ajax: 1}, function (data, textStatus, xhr) {
intermediateStep($('form', data)[0]);
});
}
@@ -712,10 +721,15 @@ var SN = { // StatusNet
}
},
- NoticeInlineReplyPlaceholder: function(notice) {
+ NoticeInlineReplyPlaceholder: function (notice) {
var list = notice.find('ul.threaded-replies');
+ if (list.length == 0) {
+ list = $('
');
+ notice.append(list);
+ list = notice.find('ul.threaded-replies');
+ }
var placeholder = $('
' +
- '' +
+ '' +
'
');
placeholder.find('input')
.val(SN.msg('reply_placeholder'));
@@ -726,20 +740,20 @@ var SN = { // StatusNet
* Setup function -- DOES NOT apply immediately.
*
* Sets up event handlers for inline reply mini-form placeholders.
- * Uses 'live' rather than 'bind', so applies to future as well as present items.
+ * Uses 'on' rather than 'live' or 'bind', so applies to future as well as present items.
*/
- NoticeInlineReplySetup: function() {
+ NoticeInlineReplySetup: function () {
$('li.notice-reply-placeholder input')
- .live('focus', function() {
+ .on('focus', function () {
var notice = $(this).closest('li.notice');
SN.U.NoticeInlineReplyTrigger(notice);
return false;
});
$('li.notice-reply-comments a')
- .live('click', function() {
+ .on('click', function () {
var url = $(this).attr('href');
var area = $(this).closest('.threaded-replies');
- $.get(url, {ajax: 1}, function(data, textStatus, xhr) {
+ $.get(url, {ajax: 1}, function (data, textStatus, xhr) {
var replies = $('.threaded-replies', data);
if (replies.length) {
area.replaceWith(document._importNode(replies[0], true));
@@ -755,10 +769,11 @@ var SN = { // StatusNet
* Sets up event handlers for repeat forms to toss up a confirmation
* popout before submitting.
*
- * Uses 'live' rather than 'bind', so applies to future as well as present items.
+ * Uses 'on' rather than 'live' or 'bind', so applies to future as well as present items.
+ *
*/
- NoticeRepeat: function() {
- $('.form_repeat').live('click', function(e) {
+ NoticeRepeat: function () {
+ $('.form_repeat').on('click', function (e) {
e.preventDefault();
SN.U.NoticeRepeatConfirmation($(this));
@@ -782,7 +797,7 @@ var SN = { // StatusNet
*
* @param {jQuery} form
*/
- NoticeRepeatConfirmation: function(form) {
+ NoticeRepeatConfirmation: function (form) {
var submit_i = form.find('.submit');
var submit = submit_i.clone();
@@ -790,7 +805,7 @@ var SN = { // StatusNet
.addClass('submit_dialogbox')
.removeClass('submit');
form.append(submit);
- submit.bind('click', function() { SN.U.FormXHR(form); return false; });
+ submit.on('click', function () { SN.U.FormXHR(form); return false; });
submit_i.hide();
@@ -800,7 +815,7 @@ var SN = { // StatusNet
.closest('.notice-options')
.addClass('opaque');
- form.find('button.close').click(function(){
+ form.find('button.close').click(function () {
$(this).remove();
form
@@ -821,8 +836,8 @@ var SN = { // StatusNet
* Goes through all notices currently displayed and sets up attachment
* handling if needed.
*/
- NoticeAttachments: function() {
- $('.notice a.attachment').each(function() {
+ NoticeAttachments: function () {
+ $('.notice a.attachment').each(function () {
SN.U.NoticeWithAttachment($(this).closest('.notice'));
});
},
@@ -837,17 +852,17 @@ var SN = { // StatusNet
*
* @param {jQuery} notice
*/
- NoticeWithAttachment: function(notice) {
+ NoticeWithAttachment: function (notice) {
if (notice.find('.attachment').length === 0) {
return;
}
var attachment_more = notice.find('.attachment.more');
if (attachment_more.length > 0) {
- $(attachment_more[0]).click(function() {
+ $(attachment_more[0]).click(function () {
var m = $(this);
m.addClass(SN.C.S.Processing);
- $.get(m.attr('href')+'/ajax', null, function(data) {
+ $.get(m.attr('href'), {ajax: 1}, function (data) {
m.parent('.entry-content').html($(data).find('#attachment_view .entry-content').html());
});
@@ -869,9 +884,10 @@ var SN = { // StatusNet
*
* @param {jQuery} form
*/
- NoticeDataAttach: function(form) {
+ NoticeDataAttach: function (form) {
+ var i;
var NDA = form.find('input[type=file]');
- NDA.change(function(event) {
+ NDA.change(function (event) {
form.find('.attach-status').remove();
var filename = $(this).val();
@@ -880,9 +896,9 @@ var SN = { // StatusNet
return false;
}
- var attachStatus = $('
');
+ var attachStatus = $('
');
attachStatus.find('code').text(filename);
- attachStatus.find('button').click(function(){
+ attachStatus.find('button').click(function () {
attachStatus.remove();
NDA.val('');
@@ -890,9 +906,9 @@ var SN = { // StatusNet
});
form.append(attachStatus);
- if (typeof this.files == "object") {
+ if (typeof this.files === "object") {
// 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]);
}
}
@@ -906,13 +922,12 @@ var SN = { // StatusNet
* @param {jQuery} form
* @return int max size in bytes; 0 or negative means no limit
*/
- maxFileSize: function(form) {
+ maxFileSize: function (form) {
var max = $(form).find('input[name=MAX_FILE_SIZE]').attr('value');
if (max) {
return parseInt(max);
- } else {
- return 0;
}
+ return 0;
},
/**
@@ -936,12 +951,12 @@ var SN = { // StatusNet
* @todo detect pixel size?
* @todo should we render a thumbnail to a canvas and then use the smaller image?
*/
- PreviewAttach: function(form, file) {
+ PreviewAttach: function (form, file) {
var tooltip = file.type + ' ' + Math.round(file.size / 1024) + 'KB';
var preview = true;
var blobAsDataURL;
- if (typeof window.createObjectURL != "undefined") {
+ if (window.createObjectURL !== undefined) {
/**
* createObjectURL lets us reference the file directly from an
* This produces a compact URL with an opaque reference to the file,
@@ -952,10 +967,10 @@ var SN = { // StatusNet
* - Safari 5.0.2: no
* - Chrome 8.0.552.210: works!
*/
- blobAsDataURL = function(blob, callback) {
+ blobAsDataURL = function (blob, callback) {
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,
* but it must read the file and build it asynchronously. This means
@@ -966,13 +981,13 @@ var SN = { // StatusNet
* - Safari 5.0.2: no
* - Chrome 8.0.552.210: works!
*/
- blobAsDataURL = function(blob, callback) {
+ blobAsDataURL = function (blob, callback) {
var reader = new FileReader();
- reader.onload = function(event) {
+ reader.onload = function (event) {
callback(reader.result);
- }
+ };
reader.readAsDataURL(blob);
- }
+ };
} else {
preview = false;
}
@@ -990,7 +1005,7 @@ var SN = { // StatusNet
}
if (preview) {
- blobAsDataURL(file, function(url) {
+ blobAsDataURL(file, function (url) {
var img = $('')
.attr('title', tooltip)
.attr('alt', tooltip)
@@ -1018,10 +1033,10 @@ var SN = { // StatusNet
* hard time figuring out if it's working or fixing if it's wrong.
*
*/
- NoticeLocationAttach: function(form) {
+ NoticeLocationAttach: function (form) {
// @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 NLon = form.find('[name=lon]')
+ var NLat = form.find('[name=lat]');
+ var NLon = form.find('[name=lon]');
var NLNS = form.find('[name=location_ns]').val();
var NLID = form.find('[name=location_id]').val();
var NLN = ''; // @fixme
@@ -1038,7 +1053,7 @@ var SN = { // StatusNet
form.find('[name=lon]').val('');
form.find('[name=location_ns]').val('');
form.find('[name=location_id]').val('');
- form.find('[name=notice_data-geo]').attr('checked', false);
+ form.find('[name=notice_data-geo]').prop('checked', false);
$.cookie(SN.C.S.NoticeDataGeoCookie, 'disabled', { path: '/' });
@@ -1052,23 +1067,22 @@ var SN = { // StatusNet
function getJSONgeocodeURL(geocodeURL, data) {
SN.U.NoticeGeoStatus(form, 'Looking up place name...');
- $.getJSON(geocodeURL, data, function(location) {
- var lns, lid;
+ $.getJSON(geocodeURL, data, function (location) {
+ 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);
lns = location.location_ns;
}
- if (typeof(location.location_id) != 'undefined') {
+ if (location.location_id !== undefined) {
form.find('[name=location_id]').val(location.location_id);
lid = location.location_id;
}
- if (typeof(location.name) == 'undefined') {
+ if (location.name === undefined) {
NLN_text = data.lat + ';' + data.lon;
- }
- else {
+ } else {
NLN_text = location.name;
}
@@ -1080,7 +1094,7 @@ var SN = { // StatusNet
form.find('[name=lon]').val(data.lon);
form.find('[name=location_ns]').val(lns);
form.find('[name=location_id]').val(lid);
- form.find('[name=notice_data-geo]').attr('checked', true);
+ form.find('[name=notice_data-geo]').prop('checked', true);
var cookieValue = {
NLat: data.lat,
@@ -1098,20 +1112,18 @@ var SN = { // StatusNet
if (check.length > 0) {
if ($.cookie(SN.C.S.NoticeDataGeoCookie) == 'disabled') {
- check.attr('checked', false);
- }
- else {
- check.attr('checked', true);
+ check.prop('checked', false);
+ } else {
+ check.prop('checked', true);
}
var NGW = form.find('.notice_data-geo_wrap');
var geocodeURL = NGW.attr('data-api');
- label
- .attr('title', label.text());
+ label.attr('title', label.text());
- check.change(function() {
- if (check.attr('checked') === true || $.cookie(SN.C.S.NoticeDataGeoCookie) === null) {
+ check.change(function () {
+ if (check.prop('checked') === true || $.cookie(SN.C.S.NoticeDataGeoCookie) === null) {
label
.attr('title', NoticeDataGeo_text.ShareDisable)
.addClass('checked');
@@ -1120,7 +1132,7 @@ var SN = { // StatusNet
if (navigator.geolocation) {
SN.U.NoticeGeoStatus(form, 'Requesting location from browser...');
navigator.geolocation.getCurrentPosition(
- function(position) {
+ function (position) {
form.find('[name=lat]').val(position.coords.latitude);
form.find('[name=lon]').val(position.coords.longitude);
@@ -1133,13 +1145,13 @@ var SN = { // StatusNet
getJSONgeocodeURL(geocodeURL, data);
},
- function(error) {
+ function (error) {
switch(error.code) {
case error.PERMISSION_DENIED:
removeNoticeDataGeo('Location permission denied.');
break;
case error.TIMEOUT:
- //$('#'+SN.C.S.NoticeDataGeo).attr('checked', false);
+ //$('#' + SN.C.S.NoticeDataGeo).prop('checked', false);
removeNoticeDataGeo('Location lookup timeout.');
break;
}
@@ -1149,8 +1161,7 @@ var SN = { // StatusNet
timeout: 10000
}
);
- }
- else {
+ } else {
if (NLat.length > 0 && NLon.length > 0) {
var data = {
lat: NLat,
@@ -1159,30 +1170,31 @@ var SN = { // StatusNet
};
getJSONgeocodeURL(geocodeURL, data);
- }
- else {
+ } else {
removeNoticeDataGeo();
check.remove();
label.remove();
}
}
+ } else {
+ try {
+ var cookieValue = JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));
+
+ form.find('[name=lat]').val(cookieValue.NLat);
+ form.find('[name=lon]').val(cookieValue.NLon);
+ form.find('[name=location_ns]').val(cookieValue.NLNS);
+ form.find('[name=location_id]').val(cookieValue.NLID);
+ form.find('[name=notice_data-geo]').prop('checked', cookieValue.NDG);
+
+ SN.U.NoticeGeoStatus(form, cookieValue.NLN, cookieValue.NLat, cookieValue.NLon, cookieValue.NLNU);
+ label
+ .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + cookieValue.NLN + ')')
+ .addClass('checked');
+ } catch (e) {
+ console.log('Parsing error:', e);
+ }
}
- else {
- var cookieValue = JSON.parse($.cookie(SN.C.S.NoticeDataGeoCookie));
-
- form.find('[name=lat]').val(cookieValue.NLat);
- form.find('[name=lon]').val(cookieValue.NLon);
- form.find('[name=location_ns]').val(cookieValue.NLNS);
- form.find('[name=location_id]').val(cookieValue.NLID);
- form.find('[name=notice_data-geo]').attr('checked', cookieValue.NDG);
-
- SN.U.NoticeGeoStatus(form, cookieValue.NLN, cookieValue.NLat, cookieValue.NLon, cookieValue.NLNU);
- label
- .attr('title', NoticeDataGeo_text.ShareDisable + ' (' + cookieValue.NLN + ')')
- .addClass('checked');
- }
- }
- else {
+ } else {
removeNoticeDataGeo();
}
}).change();
@@ -1198,13 +1210,13 @@ var SN = { // StatusNet
* @param {String} lon (optional)
* @param {String} url (optional)
*/
- NoticeGeoStatus: function(form, status, lat, lon, url)
+ NoticeGeoStatus: function (form, status, lat, lon, url)
{
var wrapper = form.find('.geo_status_wrapper');
if (wrapper.length == 0) {
- wrapper = $('