From 403633737204eeef94d9cc563229de5b22bb1eff Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 5 Apr 2016 23:19:59 -0300
Subject: [PATCH] Use index instead urls to collapse preview

---
 .../client/messageAttachment.coffee                   |  2 +-
 .../client/messageAttachment.html                     |  8 ++++----
 .../rocketchat-oembed/client/oembedAudioWidget.html   |  4 ++--
 .../rocketchat-oembed/client/oembedFrameWidget.html   |  4 ++--
 .../rocketchat-oembed/client/oembedImageWidget.html   |  4 ++--
 .../rocketchat-oembed/client/oembedVideoWidget.html   |  4 ++--
 .../rocketchat-oembed/client/oembedYoutubeWidget.html |  4 ++--
 packages/rocketchat-ui-message/message/message.coffee |  4 ++++
 packages/rocketchat-ui-message/message/message.html   |  2 ++
 packages/rocketchat-ui/views/app/room.coffee          | 11 +++++++----
 10 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.coffee b/packages/rocketchat-message-attachments/client/messageAttachment.coffee
index ef64e4365d4..c589e1c73fd 100644
--- a/packages/rocketchat-message-attachments/client/messageAttachment.coffee
+++ b/packages/rocketchat-message-attachments/client/messageAttachment.coffee
@@ -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
diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.html b/packages/rocketchat-message-attachments/client/messageAttachment.html
index 8105c024eb4..d4272d79320 100644
--- a/packages/rocketchat-message-attachments/client/messageAttachment.html
+++ b/packages/rocketchat-message-attachments/client/messageAttachment.html
@@ -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}}
diff --git a/packages/rocketchat-oembed/client/oembedAudioWidget.html b/packages/rocketchat-oembed/client/oembedAudioWidget.html
index 1b5ef1da923..2cd1035c873 100644
--- a/packages/rocketchat-oembed/client/oembedAudioWidget.html
+++ b/packages/rocketchat-oembed/client/oembedAudioWidget.html
@@ -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}}">
diff --git a/packages/rocketchat-oembed/client/oembedFrameWidget.html b/packages/rocketchat-oembed/client/oembedFrameWidget.html
index a9d9bb8e6ad..92f4297021a 100644
--- a/packages/rocketchat-oembed/client/oembedFrameWidget.html
+++ b/packages/rocketchat-oembed/client/oembedFrameWidget.html
@@ -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}}
diff --git a/packages/rocketchat-oembed/client/oembedImageWidget.html b/packages/rocketchat-oembed/client/oembedImageWidget.html
index e6722a760ce..1120bed0a24 100644
--- a/packages/rocketchat-oembed/client/oembedImageWidget.html
+++ b/packages/rocketchat-oembed/client/oembedImageWidget.html
@@ -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">
diff --git a/packages/rocketchat-oembed/client/oembedVideoWidget.html b/packages/rocketchat-oembed/client/oembedVideoWidget.html
index 9d2c3dc9701..f29fa1f6119 100644
--- a/packages/rocketchat-oembed/client/oembedVideoWidget.html
+++ b/packages/rocketchat-oembed/client/oembedVideoWidget.html
@@ -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.
diff --git a/packages/rocketchat-oembed/client/oembedYoutubeWidget.html b/packages/rocketchat-oembed/client/oembedYoutubeWidget.html
index f96719583b0..614c11df2d4 100644
--- a/packages/rocketchat-oembed/client/oembedYoutubeWidget.html
+++ b/packages/rocketchat-oembed/client/oembedYoutubeWidget.html
@@ -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}}
diff --git a/packages/rocketchat-ui-message/message/message.coffee b/packages/rocketchat-ui-message/message/message.coffee
index 35470e045e6..9d46d8f1af9 100644
--- a/packages/rocketchat-ui-message/message/message.coffee
+++ b/packages/rocketchat-ui-message/message/message.coffee
@@ -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()
 
diff --git a/packages/rocketchat-ui-message/message/message.html b/packages/rocketchat-ui-message/message/message.html
index 39d07a74662..406d7d7836a 100644
--- a/packages/rocketchat-ui-message/message/message.html
+++ b/packages/rocketchat-ui-message/message/message.html
@@ -58,10 +58,12 @@
 			{{{body}}}
 			{{#if hasOembed}}
 				{{#each urls}}
+					{{injectIndex . @index}}
 					{{> oembedBaseWidget}}
 				{{/each}}
 			{{/if}}
 			{{#each attachments}}
+				{{injectIndex . @index}}
 				{{> messageAttachment}}
 			{{/each}}
 		</div>
diff --git a/packages/rocketchat-ui/views/app/room.coffee b/packages/rocketchat-ui/views/app/room.coffee
index 66b9ba5458f..baa8847a1a1 100644
--- a/packages/rocketchat-ui/views/app/room.coffee
+++ b/packages/rocketchat-ui/views/app/room.coffee
@@ -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'