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

Remove some more reply-placeholder stuff

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-03-06 20:42:50 +01:00
parent 0da7512597
commit 8abc2d3b8d
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/util.js
View File

@ -405,16 +405,14 @@ var SN = { // StatusNet
if (replyItem.length > 0) { if (replyItem.length > 0) {
// If this is an inline reply, remove the form... // If this is an inline reply, remove the form...
var list = form.closest('.threaded-replies'); var list = form.closest('.threaded-replies');
var placeholder = list.find('.notice-reply-placeholder');
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(replyItem);
} // else Realtime came through before us... } // else Realtime came through before us...
// ...and show the placeholder form. alert('reset form now');
placeholder.show();
} else if (notices.length > 0 && SN.U.belongsOnTimeline(notice)) { } else if (notices.length > 0 && SN.U.belongsOnTimeline(notice)) {
// Not a reply. If on our timeline, show it at the top! // Not a reply. If on our timeline, show it at the top!
@ -616,7 +614,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 replyForm;
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

6
lib/action.php
View File

@ -462,12 +462,6 @@ class Action extends HTMLOutputter // lawsuit
// TRANS: Localized tooltip for '...' expansion button on overlong remote messages. // TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
$messages['showmore_tooltip'] = _m('TOOLTIP', 'Show more'); $messages['showmore_tooltip'] = _m('TOOLTIP', 'Show more');
// TRANS: Inline reply form submit button: submits a reply comment.
$messages['reply_submit'] = _m('BUTTON', 'Reply');
// TRANS: Placeholder text for inline reply form. Clicking in this box will turn it into a mini notice form.
$messages['reply_placeholder'] = _m('Write a reply...');
$messages = array_merge($messages, $this->getScriptMessages()); $messages = array_merge($messages, $this->getScriptMessages());
Event::handle('EndScriptMessages', array($this, &$messages)); Event::handle('EndScriptMessages', array($this, &$messages));