From d36ba35eaef9d6c006dfc7eb3cbb26fec05fdd96 Mon Sep 17 00:00:00 2001
From: Scott Goci <scottjg@gmail.com>
Date: Sat, 19 Apr 2014 19:06:54 -0400
Subject: [PATCH] Fixing link embedding sometimes messing up, fixed vimeo embed
 not matching what Youtube embed does, and fixed image embedding not making
 sense

---
 .../javascripts/backbone/plugins/image_embed.js.coffee      | 6 ++++--
 .../javascripts/backbone/plugins/link_embed.js.coffee       | 4 ++--
 .../javascripts/backbone/plugins/vimeo_embed.js.coffee      | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/backbone/plugins/image_embed.js.coffee b/app/assets/javascripts/backbone/plugins/image_embed.js.coffee
index 9badb725..cf44ea35 100644
--- a/app/assets/javascripts/backbone/plugins/image_embed.js.coffee
+++ b/app/assets/javascripts/backbone/plugins/image_embed.js.coffee
@@ -1,6 +1,6 @@
 class Kandan.Plugins.ImageEmbed
   @options:
-    regex: /http.*\.(jpg|jpeg|gif|png)/i
+    regex: /http[\S]*\.(jpg|jpeg|gif|png)/i
 
     template: _.template '''
       <div class="image-preview">
@@ -15,8 +15,10 @@ class Kandan.Plugins.ImageEmbed
   @init: ()->
     Kandan.Modifiers.register @options.regex, (message, activity) =>
       url        = message.match(@options.regex)[0]
+      startIndex = message.match(@options.regex).index
+      endIndex   = startIndex + url.length
       fileName   = url.split("/").pop()
-      comment    = $.trim(message.split(url).join(""))
+      comment    = $.trim(message.replace(message.substring(startIndex, endIndex),""))
       subtitle   = null
       subtitle   = comment if comment.length > 0
       subtitle ||= fileName
diff --git a/app/assets/javascripts/backbone/plugins/link_embed.js.coffee b/app/assets/javascripts/backbone/plugins/link_embed.js.coffee
index f2ce58f4..28311ddd 100644
--- a/app/assets/javascripts/backbone/plugins/link_embed.js.coffee
+++ b/app/assets/javascripts/backbone/plugins/link_embed.js.coffee
@@ -1,9 +1,9 @@
 class Kandan.Plugins.LinkEmbed
 
   @options:
-    regex: /(^| )(http?\S*)/g
+    regex: /(^| )(http?[^\s<>]*)/g
 
   @init: ()->
     Kandan.Modifiers.register @options.regex, (message, activity)=>
-      message = message.replace(@options.regex, '<a target="_blank" href="$2">$2</a>')
+      message = message.replace(@options.regex, '$1<a target="_blank" href="$2">$2</a>')
       return message
diff --git a/app/assets/javascripts/backbone/plugins/vimeo_embed.js.coffee b/app/assets/javascripts/backbone/plugins/vimeo_embed.js.coffee
index 65a15859..b876e188 100644
--- a/app/assets/javascripts/backbone/plugins/vimeo_embed.js.coffee
+++ b/app/assets/javascripts/backbone/plugins/vimeo_embed.js.coffee
@@ -26,7 +26,7 @@ class Kandan.Plugins.VimeoEmbed
       videoId = message.match(@options.regex)[2]
 
       subtitle = null
-      subtitle = "Vimeo: #{comment}" if comment? and comment.length > 0
+      subtitle = "#{comment}" if comment? and comment.length > 0
       subtitle ||= videoUrl
 
       message = @options.template({