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

Don't put reply in a popup, it was undesired for users

Browse Source 
Maybe could make that optional or something in the DefaultLayout plugin...
This commit is contained in:
Mikael Nordfeldth 2015-03-07 23:35:41 +01:00
parent 9deff7afaf
commit b604630a74
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
js/util.js
View File

@ -579,7 +579,7 @@ var SN = { // StatusNet
* Setup function -- DOES NOT trigger actions immediately. * Setup function -- DOES NOT trigger actions immediately.
* *
* Sets up event handlers on all visible notice's option <a> elements * Sets up event handlers on all visible notice's option <a> elements
* so they are called with AJAX enabled. * with the "popup" class so they behave as expected with AJAX.
* *
* (without javascript the link goes to a page that expects you to verify * (without javascript the link goes to a page that expects you to verify
* the action through a form) * the action through a form)
@ -587,17 +587,17 @@ var SN = { // StatusNet
* @access private * @access private
*/ */
NoticeOptionsAjax: function () { NoticeOptionsAjax: function () {
$(document).on('click', '.notice-options > a', function (e) { $(document).on('click', '.notice-options > a.popup', function (e) {
e.preventDefault(); e.preventDefault();
var noticeEl = $(this).closest('.notice'); var noticeEl = $(this).closest('.notice');
$.get($(this).attr('href'), {ajax: 1}, function (data, textStatus, xhr) { $.get($(this).attr('href'), {ajax: 1}, function (data, textStatus, xhr) {
SN.U.NoticeOptionPopup(data); SN.U.NoticeOptionPopup(data, noticeEl);
}); });
return false; return false;
}); });
}, },
NoticeOptionPopup: function (data) { NoticeOptionPopup: function (data, noticeEl) {
title = $('head > title', data).text(); title = $('head > title', data).text();
body = $('body', data).html(); body = $('body', data).html();
dialog = $(body).dialog({ dialog = $(body).dialog({
@ -651,20 +651,10 @@ var SN = { // StatusNet
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
var list = notice.closest('.notices'); var list = notice.find('.threaded-replies');
if (list.hasClass('threaded-replies')) { if (list.length == 0) {
// We're replying to a reply; use reply form on the end of this list. list = notice.closest('.threaded-replies');
} else {
// We're replying to a parent notice; pull its threaded list
// and we'll add on the end of it. Will add the threaded list if needed.
var list = $('ul.threaded-replies', notice);
if (list.length == 0) {
list = $('<ul class="notices threaded-replies xoxo"></ul>');
notice.append(list);
list = notice.find('ul.threaded-replies');
}
} }
var nextStep = function () { var nextStep = function () {
// Override...? // Override...?
replyForm.find('input[name=inreplyto]').val(id); replyForm.find('input[name=inreplyto]').val(id);
@ -675,6 +665,7 @@ var SN = { // StatusNet
replyForm.find('label[for=notice_to]').hide(); replyForm.find('label[for=notice_to]').hide();
replyForm.find('label[for=notice_private]').hide(); replyForm.find('label[for=notice_private]').hide();
} }
replyItem.show();
// Set focus... // Set focus...
var text = replyForm.find('textarea'); var text = replyForm.find('textarea');
@ -694,7 +685,7 @@ var SN = { // StatusNet
} }
}; };
// Create the reply form entry at the end // Create the reply form entry
var replyItem = $('li.notice-reply', list); var replyItem = $('li.notice-reply', list);
if (replyItem.length == 0) { if (replyItem.length == 0) {
replyItem = $('<li class="notice-reply"></li>'); replyItem = $('<li class="notice-reply"></li>');
@ -712,11 +703,7 @@ var SN = { // StatusNet
}); });
} else { } else {
replyForm = replyItem.children('form'); replyForm = replyItem.children('form');
if (SN.Init.NoticeFormSetup(replyForm)) { nextStep();
nextStep();
}
replyItem.show();
replyItem.find('textarea').focus();
} }
}, },

2
lib/noticelistitem.php
View File

@ -596,7 +596,7 @@ class NoticeListItem extends Widget
$deleteurl = common_local_url('deletenotice', $deleteurl = common_local_url('deletenotice',
array('notice' => $todel->id)); array('notice' => $todel->id));
$this->out->element('a', array('href' => $deleteurl, $this->out->element('a', array('href' => $deleteurl,
'class' => 'notice_delete', 'class' => 'notice_delete popup',
// TRANS: Link title in notice list item to delete a notice. // TRANS: Link title in notice list item to delete a notice.
'title' => _('Delete this notice from the timeline.')), 'title' => _('Delete this notice from the timeline.')),
// TRANS: Link text in notice list item to delete a notice. // TRANS: Link text in notice list item to delete a notice.