From: Mikael Nordfeldth <mmn@hethane.se>
Date: Fri, 6 Mar 2015 19:04:09 +0000 (+0100)
Subject: Make NoticeForm return the proper placeholder text
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=13c331fa8152f11a811d2ff66210b3298bc21ada;p=quix0rs-gnu-social.git

Make NoticeForm return the proper placeholder text

Also fixes some comments and uncertainties in the beginning of the
class definition.
---

diff --git a/lib/noticeform.php b/lib/noticeform.php
index e241b5812c..4b3801b630 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -99,14 +99,12 @@ class NoticeForm extends Form
      */
     function __construct($action, $options=null)
     {
-        // XXX: ??? Is this to keep notice forms distinct?
-        // Do we have to worry about sub-second race conditions?
-        // XXX: Needs to be above the parent::__construct() call...?
+        parent::__construct($action);
 
+        // When creating a notice form we don't want to collide with
+        // possibly existing HTML elements, as naming conventions are similar.
         $this->id_suffix = rand();
 
-        parent::__construct($action);
-
         if (is_null($options)) {
             $options = array();
         }
@@ -190,6 +188,15 @@ class NoticeForm extends Form
         $this->out->element('legend', null, _('Send a notice'));
     }
 
+    protected function placeholderText()
+    {
+        if ($this->inreplyto) {
+            return _('Write a reply...');
+        }
+
+        return _('Share your status...');
+    }
+
     /**
      * Data elements
      *
@@ -205,7 +212,7 @@ class NoticeForm extends Form
             // XXX: vary by defined max size
             $this->out->element('textarea', array('class' => 'notice_data-text',
                                                   'required' => 'required',
-                                                  'placeholder' => _('Share your status...'),
+                                                  'placeholder' => $this->placeholderText(),
                                                   'cols' => 35,
                                                   'rows' => 4,
                                                   'name' => 'status_textarea'),