Bläddra i källkod

Generic message which works for both single and groupchats

JC Brand 7 år sedan
förälder
incheckning
9a8d3b695e
2 ändrade filer med 3 tillägg och 6 borttagningar
  1. 2 3
      src/converse-chatview.js
  2. 1 3
      src/templates/chatbox_message_form.html

+ 2 - 3
src/converse-chatview.js

@@ -392,13 +392,13 @@
                     if (this.model.get('composing_spoiler')) {
                         placeholder = __('Hidden message');
                     } else {
-                        placeholder = __('Personal message');
+                        placeholder = __('Message');
                     }
                     const form_container = this.el.querySelector('.message-form-container');
                     form_container.innerHTML = tpl_chatbox_message_form(
                         _.extend(this.model.toJSON(), {
                             'hint_value': _.get(this.el.querySelector('.spoiler-hint'), 'value'),
-                            'label_personal_message': placeholder,
+                            'label_message': placeholder,
                             'label_send': __('Send'),
                             'label_spoiler_hint': __('Optional hint'),
                             'message_value': _.get(this.el.querySelector('.chat-textarea'), 'value'),
@@ -909,7 +909,6 @@
                 keyPressed (ev) {
                     /* Event handler for when a key is pressed in a chat box textarea.
                      */
-                    console.log('keypressed in chatview');
                     if (ev.ctrlKey) {
                         // When ctrl is pressed, no chars are entered into the textarea.
                         return;

+ 1 - 3
src/templates/chatbox_message_form.html

@@ -14,11 +14,9 @@
             class="chat-textarea suggestion-box__input
                 {[ if (o.show_send_button) { ]} chat-textarea-send-button {[ } ]}
                 {[ if (o.composing_spoiler) { ]} spoiler {[ } ]}"
-            placeholder="{{{o.label_personal_message}}}">{{ o.message_value }}</textarea>
+            placeholder="{{{o.label_message}}}">{{ o.message_value }}</textarea>
         <span class="suggestion-box__additions visually-hidden" role="status" aria-live="assertive" aria-relevant="additions"></span>
 
-
-
         {[ if (o.show_send_button) { ]}
             <button type="submit" class="pure-button send-button">{{{ o.label_send }}}</button>
         {[ } ]}