|
@@ -280,7 +280,7 @@
|
|
_.extend(this.model.toJSON(), {
|
|
_.extend(this.model.toJSON(), {
|
|
'allow_spoiler_messages': _converse.allow_spoiler_messages,
|
|
'allow_spoiler_messages': _converse.allow_spoiler_messages,
|
|
'label_personal_message': placeholder,
|
|
'label_personal_message': placeholder,
|
|
- 'label_spoiler_hint': __('Optional spoiler hint'),
|
|
|
|
|
|
+ 'label_spoiler_hint': __('Optional hint'),
|
|
'label_send': __('Send'),
|
|
'label_send': __('Send'),
|
|
'show_send_button': _converse.show_send_button,
|
|
'show_send_button': _converse.show_send_button,
|
|
'show_textarea': true,
|
|
'show_textarea': true,
|
|
@@ -290,6 +290,10 @@
|
|
}));
|
|
}));
|
|
},
|
|
},
|
|
|
|
|
|
|
|
+ afterRender () {
|
|
|
|
+ this.renderToolbar();
|
|
|
|
+ },
|
|
|
|
+
|
|
renderToolbar (toolbar, options) {
|
|
renderToolbar (toolbar, options) {
|
|
if (!_converse.show_toolbar) {
|
|
if (!_converse.show_toolbar) {
|
|
return this;
|
|
return this;
|
|
@@ -303,10 +307,6 @@
|
|
return this;
|
|
return this;
|
|
},
|
|
},
|
|
|
|
|
|
- afterRender () {
|
|
|
|
- this.renderToolbar();
|
|
|
|
- },
|
|
|
|
-
|
|
|
|
getToolbarOptions (options) {
|
|
getToolbarOptions (options) {
|
|
return _.extend(options || {}, {
|
|
return _.extend(options || {}, {
|
|
'allow_spoiler_messages': _converse.allow_spoiler_messages,
|
|
'allow_spoiler_messages': _converse.allow_spoiler_messages,
|
|
@@ -335,6 +335,7 @@
|
|
this.model.toJSON(), {'title': spoiler_title})
|
|
this.model.toJSON(), {'title': spoiler_title})
|
|
)
|
|
)
|
|
this.render();
|
|
this.render();
|
|
|
|
+ this.parent.focus();
|
|
}
|
|
}
|
|
});
|
|
});
|
|
|
|
|
|
@@ -390,6 +391,7 @@
|
|
this.message_form_view = new _converse.ChatBoxMessageForm({
|
|
this.message_form_view = new _converse.ChatBoxMessageForm({
|
|
'model': new Backbone.Model()
|
|
'model': new Backbone.Model()
|
|
});
|
|
});
|
|
|
|
+ this.message_form_view.parent = this;
|
|
this.message_form_view.render();
|
|
this.message_form_view.render();
|
|
this.content.insertAdjacentElement(
|
|
this.content.insertAdjacentElement(
|
|
'afterEnd',
|
|
'afterEnd',
|