apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use index instead urls to collapse preview

Browse Source
pull/2793/head^2
Rodrigo Nascimento 9 years ago
parent 90695c7cc2
commit 4036337372
10 changed files with 28 additions and 19 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      packages/rocketchat-message-attachments/client/messageAttachment.coffee
  2. 8
      packages/rocketchat-message-attachments/client/messageAttachment.html
  3. 4
      packages/rocketchat-oembed/client/oembedAudioWidget.html
  4. 4
      packages/rocketchat-oembed/client/oembedFrameWidget.html
  5. 4
      packages/rocketchat-oembed/client/oembedImageWidget.html
  6. 4
      packages/rocketchat-oembed/client/oembedVideoWidget.html
  7. 4
      packages/rocketchat-oembed/client/oembedYoutubeWidget.html
  8. 4
      packages/rocketchat-ui-message/message/message.coffee
  9. 2
      packages/rocketchat-ui-message/message/message.html
  10. 11
      packages/rocketchat-ui/views/app/room.coffee

2
packages/rocketchat-message-attachments/client/messageAttachment.coffee
Unescape View File

@ -31,7 +31,7 @@ Template.messageAttachment.helpers
when 'warning' then return '#FCB316'
when 'danger' then return '#D30230'
else return @color
collapsed: ->
if this.collapsed?
return this.collapsed

8
packages/rocketchat-message-attachments/client/messageAttachment.html
Unescape View File

@ -23,7 +23,7 @@
{{/if}}
{{/if}}
{{#if title}}
<div class="attachment-title">
<div class="attachment-title">
{{#if title_link}}
<a href="{{fixCordova title_link}}" target="_blank">{{title}}</a>
{{#if title_link_download}}
@ -33,11 +33,11 @@
{{title}}
{{/if}}
{{#if collapsed}}
<span class="collapse-switch icon-right-dir" data-url="{{image_url}}" data-collapsed="{{collapsed}}"></span>
<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
{{else}}
<span class="collapse-switch icon-down-dir" data-url="{{image_url}}" data-collapsed="{{collapsed}}"></span>
<span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
{{/if}}
</div>
</div>
{{/if}}
<div class="attachment-flex">
{{#if thumb_url}}

4
packages/rocketchat-oembed/client/oembedAudioWidget.html
Unescape View File

@ -2,9 +2,9 @@
<a href="{{url}}" target="_blank">
{{#if parsedUrl}}
{{#if collapsed}}
<span class="collapse-switch icon-right-dir" data-url="{{url}}" data-collapsed="{{collapsed}}"></span>
<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
{{else}}
<span class="collapse-switch icon-down-dir" data-url="{{url}}" data-collapsed="{{collapsed}}"></span>
<span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
<blockquote>
<audio controls>
<source src="{{url}}" type="{{headers.contentType}}">

4
packages/rocketchat-oembed/client/oembedFrameWidget.html
Unescape View File

@ -19,9 +19,9 @@
{{/if}}
{{/if}}
{{#if collapsed}}
<span class="collapse-switch icon-right-dir" data-url="{{url}}" data-collapsed="{{collapsed}}"></span><br/>
<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span><br/>
{{else}}
<span class="collapse-switch icon-down-dir" data-url="{{url}}" data-collapsed="{{collapsed}}"></span><br/>
<span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span><br/>
{{#if meta.oembedDescription}}
<p>{{meta.oembedDescription}}</p>
{{/if}}

4
packages/rocketchat-oembed/client/oembedImageWidget.html
Unescape View File

@ -1,9 +1,9 @@
<template name="oembedImageWidget">
{{#if parsedUrl}}
{{#if collapsed}}
<span class="collapse-switch icon-right-dir" data-url="{{url}}" data-collapsed="{{collapsed}}"></span>
<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
{{else}}
<span class="collapse-switch icon-down-dir" data-url="{{url}}" data-collapsed="{{collapsed}}"></span>
<span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
{{#if loadImage}}
<div>
<a href="{{url}}" class="swipebox" target="_blank">

4
packages/rocketchat-oembed/client/oembedVideoWidget.html
Unescape View File

@ -4,9 +4,9 @@
<div><a href="{{url}}">{{parsedUrl.host}}</a></div>
<span>{{title}}</span>
{{#if collapsed}}
<span class="collapse-switch icon-right-dir" data-url="{{url}}" data-collapsed="{{collapsed}}"></span>
<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
{{else}}
<span class="collapse-switch icon-down-dir" data-url="{{url}}" data-collapsed="{{collapsed}}"></span><br/>
<span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span><br/>
<video controls class="inline-video">
<source src="{{url}}" type="{{contentType}}">
Your browser does not support the video element.

4
packages/rocketchat-oembed/client/oembedYoutubeWidget.html
Unescape View File

@ -3,9 +3,9 @@
<blockquote>
<a href="{{url}}">{{parsedUrl.host}}</a>
{{#if collapsed}}
<span class="collapse-switch icon-right-dir" data-url="{{url}}" data-collapsed="{{collapsed}}"></span><br>
<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span><br>
{{else}}
<span class="collapse-switch icon-down-dir" data-url="{{url}}" data-collapsed="{{collapsed}}"></span><br>
<span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span><br>
<iframe width="355" height="200" src="{{meta.twitterPlayer}}" frameborder="0" allowfullscreen></iframe><br>
{{{meta.description}}}
{{/if}}

4
packages/rocketchat-ui-message/message/message.coffee
Unescape View File

@ -97,6 +97,10 @@ Template.message.helpers
hideReactions: ->
return 'hidden' if _.isEmpty(@reactions)
injectIndex: (data, index) ->
data.index = index
return
Template.message.onCreated ->
msg = Template.currentData()

2
packages/rocketchat-ui-message/message/message.html
Unescape View File

@ -58,10 +58,12 @@
{{{body}}}
{{#if hasOembed}}
{{#each urls}}
{{injectIndex . @index}}
{{> oembedBaseWidget}}
{{/each}}
{{/if}}
{{#each attachments}}
{{injectIndex . @index}}
{{> messageAttachment}}
{{/each}}
</div>

11
packages/rocketchat-ui/views/app/room.coffee
Unescape View File

@ -427,12 +427,15 @@ Template.room.events
ChatMessage.update {_id: this._arguments[1]._id, 'attachments.image_url': $(event.currentTarget).data('url')}, {$set: {'attachments.$.downloadImages': true}}
'click .collapse-switch': (e) ->
url = $(e.currentTarget).data('url')
index = $(e.currentTarget).data('index')
collapsed = $(e.currentTarget).data('collapsed')
id = @_arguments[1]._id
ChatMessage.update {_id: id, 'urls.url': url}, {$set: {'urls.$.collapsed': !collapsed}}
for type in ['image_url', 'audio_url', 'video_url']
ChatMessage.update {_id: id, "attachments.#{type}": url}, {$set: {'attachments.$.collapsed': !collapsed}}
if @_arguments[1]?.attachments?
ChatMessage.update {_id: id}, {$set: {"attachments.#{index}.collapsed": !collapsed}}
if @_arguments[1]?.urls?
ChatMessage.update {_id: id}, {$set: {"urls.#{index}.collapsed": !collapsed}}
'dragenter .dropzone': (e) ->
e.currentTarget.classList.add 'over'

Write Preview
Loading…
Cancel
Save