bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #7728 from MrPetovan/task/7682-better-insert-link-button

Browse source 
Discriminate between links and non-links in [url] BBCode tag insertion
This commit is contained in:
Tobias Diekershoff 2019-10-14 14:57:31 +02:00 committed by GitHub
parent c07cb2c8f3 5fcdb5de00
commit 2b8642d2b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 59 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
view/js/linkPreview.js
View file

@ -52,7 +52,6 @@
<div class="clear"></div>\
<hr class="previewseparator">';
var text;
var urlRegex = /^(?:https?\:\/\/|\s)[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})(?:\/+[a-z0-9_.\:\;-]*)*(?:\?[\&\%\|\+a-z0-9_=,\.\:\;-]*)?(?:[\&\%\|\+&a-z0-9_=,\:\;\.-]*)(?:[\!\#\/\&\%\|\+a-z0-9_=,\:\;\.-]*)}*$/i;
var binurl;
var block = false;
var blockTitle = false;

57
view/js/main.js
View file

@ -86,6 +86,8 @@ var last_popup_menu = null;
var last_popup_button = null;
var lockLoadContent = false;
const urlRegex = /^(?:https?:\/\/|\s)[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})(?:\/+[a-z0-9_.:;-]*)*(?:\?[&%|+a-z0-9_=,.:;-]*)?(?:[&%|+&a-z0-9_=,:;.-]*)(?:[!#\/&%|+a-z0-9_=,:;.-]*)}*$/i;
$(function() {
$.ajaxSetup({cache: false});
@ -404,6 +406,61 @@ $(function() {
}
});
/**
* Inserts a BBCode tag in the comment textarea identified by id
*
* @param {string} BBCode
* @param {int} id
* @returns {boolean}
*/
function insertFormatting(BBCode, id) {
let textarea = document.getElementById('comment-edit-text-' + id);
if (textarea.value === '') {
$(textarea)
.addClass("comment-edit-text-full")
.removeClass("comment-edit-text-empty");
closeMenu("comment-fake-form-" + id);
openMenu("item-comments-" + id);
}
insertBBCodeInTextarea(BBCode, textarea);
return true;
}
/**
* Inserts a BBCode tag in the provided textarea element, wrapping the currently selected text.
* For URL BBCode, it discriminates between link text and non-link text to determine where to insert the selected text.
*
* @param {string} BBCode
* @param {HTMLTextAreaElement} textarea
*/
function insertBBCodeInTextarea(BBCode, textarea) {
let selectionStart = textarea.selectionStart;
let selectionEnd = textarea.selectionEnd;
let selectedText = textarea.value.substring(selectionStart, selectionEnd);
let openingTag = '[' + BBCode + ']';
let closingTag = '[/' + BBCode + ']';
let cursorPosition = selectionStart + openingTag.length + selectedText.length;
if (BBCode === 'url') {
if (urlRegex.test(selectedText)) {
openingTag = '[' + BBCode + '=' + selectedText + ']';
selectedText = '';
cursorPosition = selectionStart + openingTag.length;
} else {
openingTag = '[' + BBCode + '=]';
cursorPosition = selectionStart + openingTag.length - 1;
}
}
textarea.value = textarea.value.substring(0, selectionStart) + openingTag + selectedText + closingTag + textarea.value.substring(selectionEnd, textarea.value.length);
textarea.setSelectionRange(cursorPosition, cursorPosition);
textarea.dispatchEvent(new Event('change'));
textarea.focus();
}
function NavUpdate() {
if (!stopped) {
var pingCmd = 'ping?format=json' + ((localUser != 0) ? '&f=&uid=' + localUser : '');

22
view/theme/duepuntozero/theme.php
View file

@ -28,28 +28,6 @@ Renderer::setActiveTemplateEngine('smarty3');
}
$a->page['htmlhead'] .= <<< EOT
<script>
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
textarea = document.getElementById("comment-edit-text-" +id);
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
return true;
}
function cmtBbOpen(comment, id) {
if ($(comment).hasClass('comment-edit-text-full')) {
$(".comment-edit-bb-" + id).show();

39
view/theme/frio/js/textedit.js
View file

@ -76,45 +76,10 @@ function commentLinkDropper(event) {
}
}
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if (tmpStr == '') {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
closeMenu("comment-fake-form-" + id);
openMenu("item-comments-" + id);
}
textarea = document.getElementById("comment-edit-text-" + id);
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
selected.text = "[" + BBcode + "]" + selected.text + "[/" + BBcode + "]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
textarea.value = textarea.value.substring(0, start) + "[" + BBcode + "]" + textarea.value.substring(start, end) + "[/" + BBcode + "]" + textarea.value.substring(end, textarea.value.length);
}
$(textarea).trigger('change');
return true;
}
function insertFormattingToPost(BBcode) {
function insertFormattingToPost(BBCode) {
textarea = document.getElementById("profile-jot-text");
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
selected.text = "[" + BBcode + "]" + selected.text + "[/" + BBcode + "]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
textarea.value = textarea.value.substring(0, start) + "[" + BBcode + "]" + textarea.value.substring(start, end) + "[/" + BBcode + "]" + textarea.value.substring(end, textarea.value.length);
}
$(textarea).trigger('change');
insertBBCodeInTextarea(BBCode, textarea);
return true;
}

22
view/theme/quattro/js/quattro.js
View file

@ -60,28 +60,6 @@ $(document).ready(function(){
});
});
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
textarea = document.getElementById("comment-edit-text-" +id);
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
return true;
}
function showThread(id) {
$("#collapsed-comments-" + id).show()
$("#collapsed-comments-" + id + " .collapsed-comments").show()

34
view/theme/smoothly/templates/bottom.tpl
View file

@ -1,41 +1,7 @@
<script type="text/javascript" src="{{$baseurl}}/view/theme/smoothly/js/jquery.autogrow.textarea.js"></script>
<script type="text/javascript">
$(document).ready(function() {
});
function tautogrow(id) {
$("textarea#comment-edit-text-" + id).autogrow();
};
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
textarea = document.getElementById("comment-edit-text-" + id);
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
textarea.value = textarea.value.substring(0, start)
+ "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]"
+ textarea.value.substring(end, textarea.value.length);
}
return true;
}
function cmtBbOpen(id) {
$(".comment-edit-bb-" + id).show();
}
function cmtBbClose(id) {
$(".comment-edit-bb-" + id).hide();
}
</script>

22
view/theme/smoothly/theme.php
View file

@ -23,28 +23,6 @@ function smoothly_init(App $a) {
$a->page['htmlhead'] .= <<< EOT
<script>
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
textarea = document.getElementById("comment-edit-text-" +id);
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
return true;
}
function cmtBbOpen(id) {
$(".comment-edit-bb-" + id).show();
}

23
view/theme/vier/theme.php
View file

@ -45,29 +45,6 @@ function vier_init(App $a)
$a->page['htmlhead'] .= <<< EOT
<link rel='stylesheet' type='text/css' href='view/theme/vier/narrow.css' media='screen and (max-width: 1100px)' />
<script type="text/javascript">
function insertFormatting(BBcode, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if (tmpStr == "") {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
textarea = document.getElementById("comment-edit-text-" +id);
if (document.selection) {
textarea.focus();
selected = document.selection.createRange();
selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
} else if (textarea.selectionStart || textarea.selectionStart == "0") {
var start = textarea.selectionStart;
var end = textarea.selectionEnd;
textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
}
return true;
}
function showThread(id) {
$("#collapsed-comments-" + id).show()
$("#collapsed-comments-" + id + " .collapsed-comments").show()