Add prompt for link and media in comment + remove video symbol

diff --git a/mod/parse_url.php b/mod/parse_url.php
index a68f405de83b0335d993dcead15b36c5212ba4ff..61c681d7230293f7b94d253f08ec36028996fc67 100644 (file)
--- 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 48ffe65b74ed16b1b59fc8cd381d75a0604bfd2c..0ec6aca0d3f8d43f285f9571e02c0950338a5b0f 100644 (file)
--- 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 551298b726cebdd20af8e5044b4aedf44af23262..f9f4ff37fc0d452f04255b3085403965e5965ae0 100644 (file)
--- 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 a9b85d3e79d7dc6e124a558591b33480eb590adf..4fa6421b51fc8d2fb2eb969a915c56c08e7b2706 100644 (file)
--- 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>