proper fix preview images

RocketChat · Dec 22, 2015 · a381bf5 · a381bf5
1 parent ec2d054
commit a381bf5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.coffee b/packages/rocketchat-message-attachments/client/messageAttachment.coffee
@@ -1,12 +1,5 @@
 Template.messageAttachment.helpers
 	fixCordova: (url) ->
-		slash = url.lastIndexOf('/') + 1
-
-		fileName = url.substr slash
-		filePath = url.substr 0, slash
-
-		url = filePath + encodeURIComponent fileName
-
 		if Meteor.isCordova and url?[0] is '/'
 			return Meteor.absoluteUrl().replace(/\/$/, '') + url
 		return url

diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.html b/packages/rocketchat-message-attachments/client/messageAttachment.html
@@ -49,7 +49,7 @@
 				<div class="attachment-image">
 					{{#if showImage}}
 						<a href="{{fixCordova image_url}}" class="swipebox" target="_blank">
-							<div class="inline-image" style="background-image: url({{fixCordova image_url}});">
+							<div class="inline-image" style="background-image: url('{{fixCordova image_url}}');">
 								<img src="{{fixCordova image_url}}" height="{{getImageHeight image_dimensions.height}}">
 							</div>
 						</a>

diff --git a/packages/rocketchat-oembed/client/oembedImageWidget.html b/packages/rocketchat-oembed/client/oembedImageWidget.html
@@ -3,7 +3,7 @@
 		{{#if parsedUrl}}
 			<div>
 				<a href="{{url}}" class="swipebox" target="_blank">
-					<div class="inline-image" style="background-image: url({{url}});">
+					<div class="inline-image" style="background-image: url('{{url}}');">
 						<img src="{{url}}" height="200">
 					</div>
 				</a>

diff --git a/packages/rocketchat-oembed/client/oembedUrlWidget.coffee b/packages/rocketchat-oembed/client/oembedUrlWidget.coffee
@@ -28,13 +28,6 @@ Template.oembedUrlWidget.helpers
 
 		decodedOgImage = @meta.ogImage?.replace?(/&amp;/g, '&')
 
-		slash = decodedOgImage.lastIndexOf('/') + 1
-
-		fileName = decodedOgImage.substr slash
-		filePath = decodedOgImage.substr 0, slash
-
-		decodedOgImage = filePath + encodeURIComponent fileName
-
 		return decodedOgImage or this.meta.twitterImage
 
 	show: ->