From 8abc2d3b8d603d45d1228684f7366b5e4e8ab8de Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Fri, 6 Mar 2015 20:42:50 +0100 Subject: [PATCH] Remove some more reply-placeholder stuff --- js/util.js | 10 ++++------ lib/action.php | 6 ------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/js/util.js b/js/util.js index 9001a401c2..ceeb1776a9 100644 --- a/js/util.js +++ b/js/util.js @@ -405,16 +405,14 @@ var SN = { // StatusNet if (replyItem.length > 0) { // If this is an inline reply, remove the form... var list = form.closest('.threaded-replies'); - var placeholder = list.find('.notice-reply-placeholder'); - replyItem.remove(); var id = $(notice).attr('id'); if ($('#' + id).length == 0) { - $(notice).insertBefore(placeholder); + $(notice).insertBefore(replyItem); } // else Realtime came through before us... - // ...and show the placeholder form. - placeholder.show(); + alert('reset form now'); + } else if (notices.length > 0 && SN.U.belongsOnTimeline(notice)) { // Not a reply. If on our timeline, show it at the top! @@ -616,7 +614,7 @@ var SN = { // StatusNet NoticeInlineReplyTrigger: function (notice, initialText) { // Find the notice we're replying to... var id = $($('.notice_id', notice)[0]).text(); - var replyForm, placeholder; + var replyForm; var parentNotice = notice; var stripForm = true; // strip a couple things out of reply forms that are inline diff --git a/lib/action.php b/lib/action.php index 66a5c69a71..f4bbb85f82 100644 --- a/lib/action.php +++ b/lib/action.php @@ -462,12 +462,6 @@ class Action extends HTMLOutputter // lawsuit // TRANS: Localized tooltip for '...' expansion button on overlong remote messages. $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()); Event::handle('EndScriptMessages', array($this, &$messages)); -- 2.39.5