From d0c43c559758e3d71005b539956092ee46ca630e Mon Sep 17 00:00:00 2001
From: Jonny Tischbein <jonny_tischbein@systemli.org>
Date: Tue, 23 Oct 2018 19:50:19 +0200
Subject: [PATCH] Add prompt for link and media in comment + remove video
 symbol

---
 mod/parse_url.php                          |  2 +-
 src/Object/Post.php                        |  3 +--
 view/theme/frio/js/textedit.js             | 11 +----------
 view/theme/frio/templates/comment_item.tpl |  6 ------
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/mod/parse_url.php b/mod/parse_url.php
index a68f405de8..61c681d723 100644
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -92,7 +92,7 @@ function parse_url_content(App $a)
 		}
 	}
 
-	if(!empty($_GET['isComment'])) {
+	if (!empty($_GET['isComment'])) {
 		echo $br . '[url]' . $url . '[/url]';
 		exit();
 	}
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 48ffe65b74..0ec6aca0d3 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -799,8 +799,7 @@ class Post extends BaseObject
 				'$edquote'     => L10n::t('Quote'),
 				'$edcode'      => L10n::t('Code'),
 				'$edimg'       => L10n::t('Image'),
-				'$edurl'       => L10n::t('Link'),
-				'$edvideo'     => L10n::t('Video'),
+				'$edurl'       => L10n::t('Link or Media'),
 				'$preview'     => ((Feature::isEnabled($conv->getProfileOwner(), 'preview')) ? L10n::t('Preview') : ''),
 				'$indent'      => $indent,
 				'$sourceapp'   => L10n::t($a->sourcename),
diff --git a/view/theme/frio/js/textedit.js b/view/theme/frio/js/textedit.js
index 551298b726..f9f4ff37fc 100644
--- a/view/theme/frio/js/textedit.js
+++ b/view/theme/frio/js/textedit.js
@@ -2,12 +2,6 @@
  * @brief The file contains functions for text editing and commenting
  */
 
-function initComment(callback) {
-    if (typeof callback != "undefined") {
-        callback();
-    }
-}
-
 function commentGetLink(id) {
     reply = prompt("Please enter a link URL:");
     if(reply && reply.length) {
@@ -37,10 +31,7 @@ function commentlinkdrop(event, id) {
     if(reply && reply.length) {
         reply = bin2hex(reply);
         $.get('parse_url?isComment=1&binurl=' + reply, function(data) {
-            if (!editor) $("comment-edit-text-" + id).val("");
-            initComment(function(){
-                addcommenttext(data, id);
-            });
+			addcommenttext(data, id);
         });
     }
 }
diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl
index a9b85d3e79..4fa6421b51 100644
--- a/view/theme/frio/templates/comment_item.tpl
+++ b/view/theme/frio/templates/comment_item.tpl
@@ -42,12 +42,6 @@
 						<i class="fa fa-link"></i>
 					</button>
 				</li>
-				<li>
-					<button type="button" class="btn-link icon bb-video" style="cursor: pointer;" aria-label="{{$edvideo}}" title="{{$edvideo}}" onclick="insertFormatting('video',{{$id}});">
-						<i class="fa fa-video-camera"></i>
-					</button>
-				</li>
-
 				<li>
 					<button type="button" class="btn-link icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
 						<i class="fa fa-underline"></i>