From abf9acca9663d41aeeb30e94d0441dffe756b889 Mon Sep 17 00:00:00 2001 From: Marcelo Schmidt Date: Mon, 17 Aug 2015 21:54:04 -0300 Subject: [PATCH] Settings: API_Embed; closes #225 --- client/views/app/message.coffee | 2 +- packages/rocketchat-external/app/client/views/message.coffee | 2 +- packages/rocketchat-oembed/server/server.coffee | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/views/app/message.coffee b/client/views/app/message.coffee index fb3bad116fab..3e369c23dae3 100644 --- a/client/views/app/message.coffee +++ b/client/views/app/message.coffee @@ -59,7 +59,7 @@ Template.message.onViewRendered = (context) -> ul = lastNode.parentElement wrapper = ul.parentElement - if context.urls?.length > 0 and Template.oembedBaseWidget? + if context.urls?.length > 0 and Template.oembedBaseWidget? and RocketChat.settings.get 'API_Embed' for item in context.urls do (item) -> urlNode = lastNode.querySelector('.body a[href="'+item.url+'"]') diff --git a/packages/rocketchat-external/app/client/views/message.coffee b/packages/rocketchat-external/app/client/views/message.coffee index 278f4f9cf88d..0b3f8c63f6f5 100644 --- a/packages/rocketchat-external/app/client/views/message.coffee +++ b/packages/rocketchat-external/app/client/views/message.coffee @@ -61,7 +61,7 @@ Template.message.onViewRendered = (context) -> ul = lastNode.parentElement wrapper = ul.parentElement - if context.urls?.length > 0 and Template.oembedBaseWidget? + if context.urls?.length > 0 and Template.oembedBaseWidget? and RocketChat.settings.get 'API_Embed' for item in context.urls do (item) -> urlNode = lastNode.querySelector('.body a[href="'+item.url+'"]') diff --git a/packages/rocketchat-oembed/server/server.coffee b/packages/rocketchat-oembed/server/server.coffee index e120627066e2..29cc0a162578 100644 --- a/packages/rocketchat-oembed/server/server.coffee +++ b/packages/rocketchat-oembed/server/server.coffee @@ -170,4 +170,5 @@ OEmbed.RocketUrlParser = (message) -> return message -RocketChat.callbacks.add 'afterSaveMessage', OEmbed.RocketUrlParser, RocketChat.callbacks.priority.LOW +if RocketChat.settings.get 'API_Embed' + RocketChat.callbacks.add 'afterSaveMessage', OEmbed.RocketUrlParser, RocketChat.callbacks.priority.LOW