X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=js%2Futil.js;h=1bd011cb0d8069621c17d47c00bc5a3ffe9c3936;hb=5358f78e824412919ddd8f3d7d2b0bf68a6292d4;hp=56ecdbcb830d8cfbb0007eb69f0fed59e57ba528;hpb=9573f725c12e291e4bd3e3156557e41a10753d76;p=quix0rs-gnu-social.git
diff --git a/js/util.js b/js/util.js
index 56ecdbcb83..1bd011cb0d 100644
--- a/js/util.js
+++ b/js/util.js
@@ -50,17 +50,6 @@ var SN = { // StatusNet
Processing: 'processing',
CommandResult: 'command_result',
FormNotice: 'form_notice',
- NoticeDataText: 'notice_data-text',
- NoticeTextCount: 'notice_text-count',
- NoticeInReplyTo: 'notice_in-reply-to',
- NoticeDataAttach: 'notice_data-attach',
- NoticeDataAttachSelected: 'notice_data-attach_selected',
- NoticeActionSubmit: 'notice_action-submit',
- NoticeLat: 'notice_data-lat',
- NoticeLon: 'notice_data-lon',
- NoticeLocationId: 'notice_data-location_id',
- NoticeLocationNs: 'notice_data-location_ns',
- NoticeGeoName: 'notice_data-geo_name',
NoticeDataGeo: 'notice_data-geo',
NoticeDataGeoCookie: 'NoticeDataGeo',
NoticeDataGeoSelected: 'notice_data-geo_selected',
@@ -106,7 +95,7 @@ var SN = { // StatusNet
*/
FormNoticeEnhancements: function(form) {
if (jQuery.data(form[0], 'ElementData') === undefined) {
- MaxLength = form.find('#'+SN.C.S.NoticeTextCount).text();
+ MaxLength = form.find('.count').text();
if (typeof(MaxLength) == 'undefined') {
MaxLength = SN.C.I.MaxLength;
}
@@ -114,7 +103,7 @@ var SN = { // StatusNet
SN.U.Counter(form);
- NDT = form.find('#'+SN.C.S.NoticeDataText);
+ NDT = form.find('[name=status_textarea]');
NDT.bind('keyup', function(e) {
SN.U.Counter(form);
@@ -132,41 +121,10 @@ var SN = { // StatusNet
// Note there's still no event for mouse-triggered 'delete'.
NDT.bind('cut', delayedUpdate)
.bind('paste', delayedUpdate);
-
- NDT.bind('keydown', function(e) {
- SN.U.SubmitOnReturn(e, form);
- });
}
else {
- form.find('#'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength);
- }
-
- if ($('body')[0].id != 'conversation' && window.location.hash.length === 0 && $(window).scrollTop() == 0) {
- form.find('textarea').focus();
- }
- },
-
- /**
- * To be called from keydown event handler on the notice import form.
- * Checks if return or enter key was pressed, and if so attempts to
- * submit the form and cancel standard processing of the enter key.
- *
- * @param {Event} event
- * @param {jQuery} el: jQuery object whose first element is the notice posting form
- *
- * @return {boolean} whether to cancel the event? Does this actually pass through?
- * @access private
- */
- SubmitOnReturn: function(event, el) {
- if (event.keyCode == 13 || event.keyCode == 10) {
- el.submit();
- event.preventDefault();
- event.stopPropagation();
- $('#'+el[0].id+' #'+SN.C.S.NoticeDataText).blur();
- $('body').focus();
- return false;
+ form.find('.count').text(jQuery.data(form[0], 'ElementData').MaxLength);
}
- return true;
},
/**
@@ -193,7 +151,7 @@ var SN = { // StatusNet
}
var remaining = MaxLength - SN.U.CharacterCount(form);
- var counter = form.find('#'+SN.C.S.NoticeTextCount);
+ var counter = form.find('.count');
if (remaining.toString() != counter.text()) {
if (!SN.C.I.CounterBlackout || remaining === 0) {
@@ -224,7 +182,7 @@ var SN = { // StatusNet
* @return number of chars
*/
CharacterCount: function(form) {
- return form.find('#'+SN.C.S.NoticeDataText).val().length;
+ return form.find('[name=status_textarea]').val().length;
},
/**
@@ -365,46 +323,24 @@ var SN = { // StatusNet
dataType: 'xml',
timeout: '60000',
beforeSend: function(formData) {
- if (form.find('#'+SN.C.S.NoticeDataText)[0].value.length === 0) {
+ if (form.find('[name=status_textarea]').val() == '') {
form.addClass(SN.C.S.Warning);
return false;
}
form
.addClass(SN.C.S.Processing)
- .find('#'+SN.C.S.NoticeActionSubmit)
+ .find('.submit')
.addClass(SN.C.S.Disabled)
.attr(SN.C.S.Disabled, SN.C.S.Disabled);
- SN.C.I.NoticeDataGeo.NLat = $('#'+SN.C.S.NoticeLat).val();
- SN.C.I.NoticeDataGeo.NLon = $('#'+SN.C.S.NoticeLon).val();
- SN.C.I.NoticeDataGeo.NLNS = $('#'+SN.C.S.NoticeLocationNs).val();
- SN.C.I.NoticeDataGeo.NLID = $('#'+SN.C.S.NoticeLocationId).val();
- SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked');
-
- cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie);
-
- if (cookieValue !== null && cookieValue != 'disabled') {
- cookieValue = JSON.parse(cookieValue);
- SN.C.I.NoticeDataGeo.NLat = $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat).val();
- SN.C.I.NoticeDataGeo.NLon = $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon).val();
- if ($('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)) {
- SN.C.I.NoticeDataGeo.NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();
- SN.C.I.NoticeDataGeo.NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val();
- }
- }
- if (cookieValue == 'disabled') {
- SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked');
- }
- else {
- SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', true).attr('checked');
- }
+ SN.U.normalizeGeoData(form);
return true;
},
error: function (xhr, textStatus, errorThrown) {
form
.removeClass(SN.C.S.Processing)
- .find('#'+SN.C.S.NoticeActionSubmit)
+ .find('.submit')
.removeClass(SN.C.S.Disabled)
.removeAttr(SN.C.S.Disabled, SN.C.S.Disabled);
removeFeedback();
@@ -421,7 +357,7 @@ var SN = { // StatusNet
if (parseInt(xhr.status) === 0 || jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) >= 0) {
form
.resetForm()
- .find('#'+SN.C.S.NoticeDataAttachSelected).remove();
+ .find('.attach-status').remove();
SN.U.FormNoticeEnhancements(form);
}
else {
@@ -450,10 +386,10 @@ var SN = { // StatusNet
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');
+ var notices = $('#notices_primary .notices:first');
if (notices.length > 0 && SN.U.belongsOnTimeline(notice)) {
if ($('#'+notice.id).length === 0) {
- var notice_irt_value = $('#'+SN.C.S.NoticeInReplyTo).val();
+ 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) {
@@ -478,29 +414,56 @@ var SN = { // StatusNet
}
}
form.resetForm();
- form.find('#'+SN.C.S.NoticeInReplyTo).val('');
- form.find('#'+SN.C.S.NoticeDataAttachSelected).remove();
+ form.find('[name=inreplyto]').val('');
+ form.find('.attach-status').remove();
SN.U.FormNoticeEnhancements(form);
}
},
complete: function(xhr, textStatus) {
form
.removeClass(SN.C.S.Processing)
- .find('#'+SN.C.S.NoticeActionSubmit)
+ .find('.submit')
.removeAttr(SN.C.S.Disabled)
.removeClass(SN.C.S.Disabled);
- $('#'+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);
- $('#'+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);
- if ($('#'+SN.C.S.NoticeLocationNs)) {
- $('#'+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);
- $('#'+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID);
- }
- $('#'+SN.C.S.NoticeDataGeo).attr('checked', SN.C.I.NoticeDataGeo.NDG);
+ 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);
}
});
},
+ 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
+
+ var cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie);
+
+ if (cookieValue !== null && 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();
+ if (cookieValue.NLNS) {
+ SN.C.I.NoticeDataGeo.NLNS = form.find('[name=location_ns]').val(cookieValue.NLNS).val();
+ SN.C.I.NoticeDataGeo.NLID = form.find('[name=location_id]').val(cookieValue.NLID).val();
+ } else {
+ form.find('[name=location_ns]').val('');
+ form.find('[name=location_id]').val('');
+ }
+ }
+ 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');
+ }
+
+ },
/**
* Fetch an XML DOM from an XHR's response data.
*
@@ -533,7 +496,7 @@ var SN = { // StatusNet
* @access private
*/
NoticeReply: function() {
- if ($('#'+SN.C.S.NoticeDataText).length > 0 && $('#content .notice_reply').length > 0) {
+ if ($('#content .notice_reply').length > 0) {
$('#content .notice').each(function() { SN.U.NoticeReplyTo($(this)); });
}
},
@@ -553,36 +516,161 @@ var SN = { // StatusNet
* @access private
*/
NoticeReplyTo: function(notice) {
- notice.find('.notice_reply').live('click', function() {
+ notice.find('.notice_reply').live('click', function(e) {
+ e.preventDefault();
var nickname = ($('.author .nickname', notice).length > 0) ? $($('.author .nickname', notice)[0]) : $('.author .nickname.uid');
- SN.U.NoticeReplySet(nickname.text(), $($('.notice_id', notice)[0]).text());
+ SN.U.NoticeInlineReplyTrigger(notice, '@' + nickname.text());
return false;
});
},
/**
- * Updates the new notice posting form with bits for replying to the
- * given user. Adds replyto parameter to the form, and a "@foo" to the
- * text area.
+ * Open up a notice's inline reply box.
*
- * @fixme replyto is a global variable, but probably shouldn't be
- *
- * @param {String} nick
- * @param {String} id
+ * @param {jQuery} notice: jQuery object containing one notice
+ * @param {String} initialText
*/
- NoticeReplySet: function(nick,id) {
- if (nick.match(SN.C.I.PatternUsername)) {
- var text = $('#'+SN.C.S.NoticeDataText);
- if (text.length > 0) {
- replyto = '@' + nick + ' ';
- text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
- $('#'+SN.C.S.FormNotice+' #'+SN.C.S.NoticeInReplyTo).val(id);
-
- text[0].focus();
- if (text[0].setSelectionRange) {
- var len = text.val().length;
- text[0].setSelectionRange(len,len);
- }
+ NoticeInlineReplyTrigger: function(notice, initialText) {
+ // Find the notice we're replying to...
+ var id = $($('.notice_id', notice)[0]).text();
+ var parentNotice = notice;
+
+ // Find the threaded replies view we'll be adding to...
+ var list = notice.closest('.notices');
+ 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');
+ } 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);
+ }
+ }
+
+ // See if the form's already open...
+ var replyForm = $('.notice-reply-form', list);
+
+ var nextStep = function() {
+ // Override...?
+ replyForm.find('input[name=inreplyto]').val(id);
+
+ // Set focus...
+ var text = replyForm.find('textarea');
+ if (text.length == 0) {
+ throw "No textarea";
+ }
+ var replyto = '';
+ if (initialText) {
+ replyto = initialText + ' ';
+ }
+ text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
+ text.data('initialText', $.trim(initialText + ''));
+ text.focus();
+ if (text[0].setSelectionRange) {
+ var len = text.val().length;
+ text[0].setSelectionRange(len,len);
+ }
+ };
+ if (replyForm.length > 0) {
+ // Update the existing form...
+ nextStep();
+ } else {
+ // Remove placeholder if any
+ $('li.notice-reply-placeholder').remove();
+
+ // Create the reply form entry at the end
+ var replyItem = $('li.notice-reply', list);
+ if (replyItem.length == 0) {
+ var url = $('#form_notice').attr('action');
+ replyItem = $('');
+ $.get(url, {ajax: 1}, function(data, textStatus, xhr) {
+ var formEl = document._importNode($('form', data)[0], true);
+ replyItem.append(formEl);
+ list.append(replyItem);
+
+ var form = replyForm = $(formEl);
+ SN.U.NoticeLocationAttach(form);
+ SN.U.FormNoticeXHR(form);
+ SN.U.FormNoticeEnhancements(form);
+ SN.U.NoticeDataAttach(form);
+
+ nextStep();
+ });
+ /*
+ replyItem = $('
' +
+ '' +
+ '
');
+ var baseForm = $('#form_notice');
+ replyForm = replyItem.find('form');
+ replyForm.attr('action', baseForm.attr('action'));
+ replyForm.find('input[name="token"]').val(baseForm.find('input[name=token]').val());
+ replyForm.find('input[type="submit"]').val(SN.msg('reply_submit'));
+ list.append(replyItem);
+
+ replyForm.find('textarea').blur(function() {
+ var textarea = $(this);
+ var txt = $.trim(textarea.val());
+ if (txt == '' || txt == textarea.data('initialText')) {
+ // Nothing to say? Begone!
+ replyItem.remove();
+ if (list.find('li').length > 0) {
+ SN.U.NoticeInlineReplyPlaceholder(parentNotice);
+ } else {
+ list.remove();
+ }
+ }
+ });
+ replyForm.submit(function(event) {
+ var form = replyForm;
+ $.ajax({
+ type: 'POST',
+ dataType: 'xml',
+ url: SN.U.RewriteAjaxAction(form.attr('action')),
+ data: form.serialize() + '&ajax=1',
+ 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)
+ .end()
+ .find('textarea')
+ .addClass(SN.C.S.Disabled)
+ .attr(SN.C.S.Disabled, SN.C.S.Disabled);
+ },
+ error: function (xhr, textStatus, errorThrown) {
+ alert(errorThrown || textStatus);
+ },
+ success: function(data, textStatus) {
+ var orig_li = $('li', data)[0];
+ if (orig_li) {
+ var li = document._importNode(orig_li, true);
+ var id = $(li).attr('id');
+ if ($("#"+id).length == 0) {
+ replyItem.replaceWith(li);
+ SN.U.NoticeInlineReplyPlaceholder(parentNotice);
+ } else {
+ // Realtime came through before us...
+ replyItem.remove();
+ }
+ }
+ }
+ });
+ event.preventDefault();
+ return false;
+ });
+ */
}
}
},
@@ -598,6 +686,32 @@ var SN = { // StatusNet
$('.form_disfavor').live('click', function() { SN.U.FormXHR($(this)); return false; });
},
+ NoticeInlineReplyPlaceholder: function(notice) {
+ var list = notice.find('ul.threaded-replies');
+ var placeholder = $('
' +
+ '' +
+ '
');
+ placeholder.click(function() {
+ SN.U.NoticeInlineReplyTrigger(notice);
+ });
+ placeholder.find('input').val(SN.msg('reply_placeholder'));
+ list.append(placeholder);
+ },
+
+ /**
+ * Setup function -- DOES NOT apply immediately.
+ *
+ * Sets up event handlers for favor/disfavor forms to submit via XHR.
+ * Uses 'live' rather than 'bind', so applies to future as well as present items.
+ */
+ NoticeInlineReplySetup: function() {
+ $('.threaded-replies').each(function() {
+ var list = $(this);
+ var notice = list.closest('.notice');
+ SN.U.NoticeInlineReplyPlaceholder(notice);
+ });
+ },
+
/**
* Setup function -- DOES NOT trigger actions immediately.
*
@@ -715,36 +829,34 @@ var SN = { // StatusNet
*
* This preview box will also allow removing the attachment
* prior to posting.
+ *
+ * @param {jQuery} form
*/
- NoticeDataAttach: function() {
- NDA = $('#'+SN.C.S.NoticeDataAttach);
+ NoticeDataAttach: function(form) {
+ var NDA = form.find('input[type=file]');
NDA.change(function(event) {
+ form.find('.attach-status').remove();
+
var filename = $(this).val();
if (!filename) {
// No file -- we've been tricked!
- $('#'+SN.C.S.NoticeDataAttachSelected).remove();
return false;
}
- // @fixme appending filename straight in is potentially unsafe
- S = '