+
should load chat 1`] = `
all
should load chat 1`] = `
direct
- {channel.channel_name}
+ {isUnopened ?
: ''}{channel.channel_name}
);
diff --git a/app/javascript/chat/chat.jsx b/app/javascript/chat/chat.jsx
index e97a5c379..a7d609155 100644
--- a/app/javascript/chat/chat.jsx
+++ b/app/javascript/chat/chat.jsx
@@ -74,10 +74,12 @@ export default class Chat extends Component {
startEditing: false,
activeEditMessage: {},
markdownEdited: false,
+ searchShowing: false,
channelUsers: [],
showMemberlist: false,
memberFilterQuery: null,
};
+ getAllMessages(chatOptions.activeChannelId, 0, this.receiveAllMessages);
}
componentDidMount() {
@@ -89,6 +91,7 @@ export default class Chat extends Component {
isMobileDevice,
channelPaginationNum,
currentUserId,
+ messageOffset,
} = this.state;
this.setupChannels(chatChannels);
@@ -935,8 +938,8 @@ export default class Chat extends Component {
);
+ toggleSearchShowing = () => {
+ if (!this.state.searchShowing) {
+ setTimeout(function(){
+ document.getElementById("chatchannelsearchbar").focus()
+ },100)
+ }
+ this.setState({searchShowing: !this.state.searchShowing})
+ }
+
renderChatChannels = () => {
const { state } = this;
if (state.showChannelsList) {
@@ -993,9 +1005,10 @@ export default class Chat extends Component {
>
{'<'}
-
+ {state.searchShowing ?
: ''}
{invitesButton}
+
{this.renderChannelFilterButton(
'all',
'all',
diff --git a/app/javascript/packs/videoChat.jsx b/app/javascript/packs/videoChat.jsx
index 696cf4e3a..372f2d670 100644
--- a/app/javascript/packs/videoChat.jsx
+++ b/app/javascript/packs/videoChat.jsx
@@ -51,7 +51,7 @@ connect(root.dataset.token, { name: 'room-name', audio: true, type: roomType, vi
createLocalVideoTrack().then(track => {
localMediaContainer.appendChild(track.attach());
-
+ document.getElementById('video-controls').classList.add('showing');
});
diff --git a/app/models/message.rb b/app/models/message.rb
index 7a123d31e..e346f5c61 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -40,6 +40,7 @@ class Message < ApplicationRecord
def evaluate_markdown
html = MarkdownParser.new(message_markdown).evaluate_markdown
+ html = target_blank_links(html)
html = append_rich_links(html)
html = wrap_mentions_with_links(html)
html = handle_call(html)
@@ -90,6 +91,13 @@ class Message < ApplicationRecord
end
end
+ def target_blank_links(html)
+ return html if html.blank?
+
+ html = html.gsub("
".html_safe
+ elsif anchor["href"].include?("https://www.figma.com/file/") # Proof of concept
+ html += "
+ Figma File
+ ".html_safe
+ elsif anchor["href"].starts_with?("https://docs.google.com/") # Proof of concept
+ html += "
+ Google Docs
+ ".html_safe
end
end
html
@@ -128,9 +144,9 @@ class Message < ApplicationRecord
return html if html.to_s.exclude?("
/call
")
"
-
+
Let's video chat 😄
".html_safe
diff --git a/app/views/chat_channels/index.html.erb b/app/views/chat_channels/index.html.erb
index 19ca3c730..4bb695654 100644
--- a/app/views/chat_channels/index.html.erb
+++ b/app/views/chat_channels/index.html.erb
@@ -19,7 +19,6 @@
-
diff --git a/app/views/video_chats/show.html.erb b/app/views/video_chats/show.html.erb
index 9530dae33..8fc9b72bd 100644
--- a/app/views/video_chats/show.html.erb
+++ b/app/views/video_chats/show.html.erb
@@ -6,7 +6,6 @@
.video-chat-wrapper {
position: relative;
height: 100vh;
- background: #171717;
overflow: scroll;
}
.individual-video video {
@@ -18,10 +17,14 @@
.individual-video {
overflow: hidden;
}
+ .individual-video:last-child {
+ margin-bottom: 100px;
+ }
+
#local-media video {
width: 150px;
- position: absolute;
+ position: fixed;
bottom: 10px;
right: 10px;
z-index: 5;
@@ -54,10 +57,16 @@
margin: 8px;
}
.video-controls {
- position: absolute;
+ position: fixed;
bottom: 15px;
left: 5px;
width: calc(100% - 175px);
+ z-index: 10;
+ display: none;
+ }
+
+ .showing {
+ display: block;
}
.video-controls button {
@@ -95,13 +104,24 @@
color: white;
margin-top: 30px;
}
+
+ @media screen and (max-width: 280px) {
+ .video-controls {
+ width: 92%;
+ bottom: 5px;
+ }
+ #local-media video {
+ width: 90%;
+ bottom: 85px;
+ }
+ }
-
+
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index 94f89f5c0..8b32c03fb 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -50,6 +50,13 @@ RSpec.describe Message, type: :model do
expect(message.message_html).to include("sidecar-article")
end
+ it "creates target blank link" do
+ message.message_markdown = "hello http://#{ApplicationConfig['APP_DOMAIN']}#{user.path}"
+ message.validate!
+
+ expect(message.message_html).to include("