[FIX] Channel settings form to textarea for Topic and Description (#13328)

* fix: make room description and topic text area

* cleanup: remove comments

* fix review
pull/13919/head
Supratik Das 7 years ago committed by Guilherme Gazzo
parent 9bc520d079
commit cb4680d7ed
  1. 2
      app/channel-settings/client/stylesheets/channel-settings.css
  2. 4
      app/channel-settings/client/views/channelSettings.html
  3. 10
      app/ui/client/components/header/headerRoom.js

@ -1,4 +1,4 @@
html.rtl .flex-tab {
.rtl .flex-tab {
direction: rtl;
& .channel-settings {

@ -28,7 +28,7 @@
<label class="rc-input__label">
<div class="rc-input__title">{{_ label}}{{equal default value '*'}}</div>
<div class="rc-input__wrapper">
<input type="text" name="topic" value="{{value}}" class="rc-input__element js-input" disabled="{{./disabled}}"/>
<textarea name="topic" value="{{value}}" class="rc-input__element js-input" disabled="{{./disabled}}" id="" cols="30" rows="2"></textarea>
</div>
</label>
</div>
@ -54,7 +54,7 @@
<label class="rc-input__label">
<div class="rc-input__title">{{_ label}}{{equal default value '*'}}</div>
<div class="rc-input__wrapper">
<input type="text" name="description" value="{{value}}" class="rc-input__element js-input" disabled="{{./disabled}}"/>
<textarea name="description" value="{{value}}" class="rc-input__element js-input" disabled="{{./disabled}}" id="" cols="30" rows="2"></textarea>
</div>
</label>
</div>

@ -79,19 +79,15 @@ Template.headerRoom.helpers({
const roomData = Session.get(`roomData${ this._id }`);
if (!roomData || !roomData.topic) { return ''; }
let roomTopic = Markdown.parse(roomData.topic);
let roomTopic = Markdown.parse(roomData.topic.replace(/\n/mg, ' '));
// &#39; to apostrophe (') for emojis such as :')
roomTopic = roomTopic.replace(/&#39;/g, '\'');
Object.keys(emoji.packages).forEach((emojiPackage) => {
roomTopic = emoji.packages[emojiPackage].render(roomTopic);
});
roomTopic = Object.keys(emoji.packages).reduce((topic, emojiPackage) => emoji.packages[emojiPackage].render(topic), roomTopic);
// apostrophe (') back to &#39;
roomTopic = roomTopic.replace(/\'/g, '&#39;');
return roomTopic;
return roomTopic.replace(/\'/g, '&#39;');
},
roomIcon() {

Loading…
Cancel
Save