Merge pull request #4473 from annando/issue-4228

[friendica.git] / view / theme / frio / js / textedit.js

diff --git a/view/theme/frio/js/textedit.js b/view/theme/frio/js/textedit.js
index 02191f33dee6ba2a71639553f3e74bcfc39249ef..2079c20cdc40a12080da8546045253ecf25a42af 100644 (file)
--- a/view/theme/frio/js/textedit.js
+++ b/view/theme/frio/js/textedit.js
@@ -3,7 +3,7 @@
  */
 
 
-function insertFormatting(BBcode,id) {
+function insertFormatting(BBcode, id) {
        var tmpStr = $("#comment-edit-text-" + id).val();
        if (tmpStr == '') {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
@@ -11,25 +11,19 @@ function insertFormatting(BBcode,id) {
                openMenu("comment-edit-submit-wrapper-" + id);
        }
 
-       textarea = document.getElementById("comment-edit-text-" +id);
+       textarea = document.getElementById("comment-edit-text-" + id);
        if (document.selection) {
                textarea.focus();
                selected = document.selection.createRange();
-               if (BBcode == "url") {
-                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-               } else {
-                       selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-               }
+               selected.text = "[" + BBcode + "]" + selected.text + "[/" + BBcode + "]";
        } else if (textarea.selectionStart || textarea.selectionStart == "0") {
                var start = textarea.selectionStart;
                var end = textarea.selectionEnd;
-               if (BBcode == "url") {
-                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-               } else {
-                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-               }
+               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;
 }
 
@@ -60,7 +54,7 @@ function commentExpand(id) {
        return true;
 }
 
-function commentClose(obj,id) {
+function commentClose(obj, id) {
        if (obj.value == '') {
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
@@ -72,10 +66,9 @@ function commentClose(obj,id) {
 }
 
 function showHideCommentBox(id) {
-       if( $('#comment-edit-form-' + id).is(':visible')) {
+       if ($('#comment-edit-form-' + id).is(':visible')) {
                $('#comment-edit-form-' + id).hide();
-       }
-       else {
+       } else {
                $('#comment-edit-form-' + id).show();
        }
 }
@@ -84,8 +77,8 @@ function commentOpenUI(obj, id) {
        $("#comment-edit-text-" + id).addClass("comment-edit-text-full").removeClass("comment-edit-text-empty");
        // Choose an arbitrary tab index that's greater than what we're using in jot (3 of them)
        // The submit button gets tabindex + 1
-       $("#comment-edit-text-" + id).attr('tabindex','9');
-       $("#comment-edit-submit-" + id).attr('tabindex','10');
+       $("#comment-edit-text-" + id).attr('tabindex', '9');
+       $("#comment-edit-submit-" + id).attr('tabindex', '10');
        $("#comment-edit-submit-wrapper-" + id).show();
        // initialize autosize for this comment
        autosize($("#comment-edit-text-" + id + ".text-autosize"));
@@ -118,7 +111,7 @@ function jotTextCloseUI(obj) {
        }
 }
 
-function commentOpen(obj,id) {
+function commentOpen(obj, id) {
        if (obj.value == '') {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
                $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
@@ -129,7 +122,7 @@ function commentOpen(obj,id) {
        return false;
 }
 
-function commentInsert(obj,id) {
+function commentInsert(obj, id) {
        var tmpStr = $("#comment-edit-text-" + id).val();
        if (tmpStr == '') {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
@@ -137,14 +130,14 @@ function commentInsert(obj,id) {
                openMenu("comment-edit-submit-wrapper-" + id);
        }
        var ins = $(obj).html();
-       ins = ins.replace('&lt;','<');
-       ins = ins.replace('&gt;','>');
-       ins = ins.replace('&amp;','&');
-       ins = ins.replace('&quot;','"');
+       ins = ins.replace('&lt;', '<');
+       ins = ins.replace('&gt;', '>');
+       ins = ins.replace('&amp;', '&');
+       ins = ins.replace('&quot;', '"');
        $("#comment-edit-text-" + id).val(tmpStr + ins);
 }
 
-function qCommentInsert(obj,id) {
+function qCommentInsert(obj, id) {
        var tmpStr = $("#comment-edit-text-" + id).val();
        if (tmpStr == '') {
                $("#comment-edit-text-" + id).addClass("comment-edit-text-full");
@@ -152,15 +145,17 @@ function qCommentInsert(obj,id) {
                openMenu("comment-edit-submit-wrapper-" + id);
        }
        var ins = $(obj).val();
-       ins = ins.replace('&lt;','<');
-       ins = ins.replace('&gt;','>');
-       ins = ins.replace('&amp;','&');
-       ins = ins.replace('&quot;','"');
+       ins = ins.replace('&lt;', '<');
+       ins = ins.replace('&gt;', '>');
+       ins = ins.replace('&amp;', '&');
+       ins = ins.replace('&quot;', '"');
        $("#comment-edit-text-" + id).val(tmpStr + ins);
        $(obj).val('');
 }
 
-function confirmDelete() { return confirm(aStr.delitem); }
+function confirmDelete() {
+       return confirm(aStr.delitem);
+}
 
 /**
  * Hide and removes an item element from the DOM after the deletion url is
@@ -181,7 +176,7 @@ function dropItem(url, elementId) {
                $el.fadeTo('fast', 0.33, function () {
                        $.get(url).then(function() {
                                $el.remove();
-                       }).error(function() {
+                       }).fail(function() {
                                // @todo Show related error message
                                $el.show();
                        }).always(function() {