From 3065d1c40afec3bef9c5b82a10672a5746fc2915 Mon Sep 17 00:00:00 2001 From: Jonny Tischbein Date: Wed, 17 Oct 2018 21:05:45 +0200 Subject: [PATCH 1/9] Add Link promt in comment + only add URL instead of attachement via parse_url --- mod/parse_url.php | 5 +++ view/theme/frio/js/textedit.js | 49 ++++++++++++++++++++++ view/theme/frio/templates/comment_item.tpl | 2 +- 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/mod/parse_url.php b/mod/parse_url.php index 40eddc3bd..a68f405de 100644 --- a/mod/parse_url.php +++ b/mod/parse_url.php @@ -92,6 +92,11 @@ function parse_url_content(App $a) } } + if(!empty($_GET['isComment'])) { + echo $br . '[url]' . $url . '[/url]'; + exit(); + } + $template = '[bookmark=%s]%s[/bookmark]%s'; $arr = ['url' => $url, 'text' => '']; diff --git a/view/theme/frio/js/textedit.js b/view/theme/frio/js/textedit.js index ad5f95023..551298b72 100644 --- a/view/theme/frio/js/textedit.js +++ b/view/theme/frio/js/textedit.js @@ -2,6 +2,55 @@ * @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) { + reply = bin2hex(reply); + $.get('parse_url?isComment=1&binurl=' + reply, function(data) { + addcommenttext(data, id); + }); + } +} + +function addcommenttext(data, id) { + // get the textfield + var textfield = document.getElementById("comment-edit-text-" + id); + // check if the textfield does have the default-value + commentOpenUI(textfield, id); + // save already existent content + var currentText = $("#comment-edit-text-" + id).val(); + //insert the data as new value + textfield.value = currentText + data; + autosize.update($("#comment-edit-text-" + id)); +} + +function commentlinkdrop(event, id) { + var reply = event.dataTransfer.getData("text/uri-list"); + event.target.textContent = reply; + event.preventDefault(); + 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); + }); + }); + } +} + +function commentlinkdropper(event) { + var linkFound = event.dataTransfer.types.contains("text/uri-list"); + if(linkFound) + event.preventDefault(); +} + function insertFormatting(BBcode, id) { var tmpStr = $("#comment-edit-text-" + id).val(); diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl index 8d90394d5..a9b85d3e7 100644 --- a/view/theme/frio/templates/comment_item.tpl +++ b/view/theme/frio/templates/comment_item.tpl @@ -38,7 +38,7 @@
  • -
  • From d0c43c559758e3d71005b539956092ee46ca630e Mon Sep 17 00:00:00 2001 From: Jonny Tischbein Date: Tue, 23 Oct 2018 19:50:19 +0200 Subject: [PATCH 2/9] 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 a68f405de..61c681d72 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 48ffe65b7..0ec6aca0d 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 551298b72..f9f4ff37f 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 a9b85d3e7..4fa6421b5 100644 --- a/view/theme/frio/templates/comment_item.tpl +++ b/view/theme/frio/templates/comment_item.tpl @@ -42,12 +42,6 @@ -
  • - -
  • -
  • -
  • +
  • + +
  • -
  • -
  • -
  • +
  • +