diff --git a/app/assets/javascripts/backbone/plugins/hex_color_embed.js.coffee b/app/assets/javascripts/backbone/plugins/hex_color_embed.js.coffee index 90b98b3f..fb57119f 100644 --- a/app/assets/javascripts/backbone/plugins/hex_color_embed.js.coffee +++ b/app/assets/javascripts/backbone/plugins/hex_color_embed.js.coffee @@ -1,16 +1,13 @@ class Kandan.Plugins.HexColorEmbed @options: - regex: /#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/ + regex: /#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/g - template: _.template ''' - - ''' + template: _.template '''''' @init: ()-> Kandan.Modifiers.register @options.regex, (message, state) => - hex = message.content.match(@options.regex)[0] - replacement = @options.template({hex: hex}) + hex - - message.content = message.content.replace(hex, replacement) + for hex in message.content.match(@options.regex) + replacement = @options.template({hex: hex}) + hex + message.content = message.content.replace(hex, replacement) return Kandan.Helpers.Activities.buildFromMessageTemplate(message) diff --git a/app/assets/javascripts/backbone/plugins/rgb_color_embed.js.coffee b/app/assets/javascripts/backbone/plugins/rgb_color_embed.js.coffee index fabfdd7e..67629ddd 100644 --- a/app/assets/javascripts/backbone/plugins/rgb_color_embed.js.coffee +++ b/app/assets/javascripts/backbone/plugins/rgb_color_embed.js.coffee @@ -1,17 +1,14 @@ class Kandan.Plugins.RgbColorEmbed @options: - regex: /rgb\((\d{1,3}),\s?(\d{1,3}),\s?(\d{1,3})\)/ + regex: /rgb\((\d{1,3}),\s?(\d{1,3}),\s?(\d{1,3})\)/g - template: _.template ''' - - ''' + template: _.template '''''' @init: ()-> Kandan.Modifiers.register @options.regex, (message, state) => - rgb = message.content.match(@options.regex)[0] - replacement = @options.template({rgb: rgb}) + rgb - - message.content = message.content.replace(rgb, replacement) + for rgb in message.content.match(@options.regex) + replacement = @options.template({rgb: rgb}) + rgb + message.content = message.content.replace(rgb, replacement) return Kandan.Helpers.Activities.buildFromMessageTemplate(message)