frio: fix - jot default was not removed in every case while inserting content

diff --git a/view/theme/frio/js/textedit.js b/view/theme/frio/js/textedit.js
index 40b49685a7b713d3f77ee51e8184143ff3bcbaca..0b3db0571f982efd67fe428ce878e5bb14f0ddab 100644 (file)
--- a/view/theme/frio/js/textedit.js
+++ b/view/theme/frio/js/textedit.js
@@ -191,5 +191,3 @@ function dropItem(url, object) {
                });
        }
 }
-
-       
\ No newline at end of file

diff --git a/view/theme/frio/templates/jot-header.tpl b/view/theme/frio/templates/jot-header.tpl
index 6d481451185c6c8aa9cdf633599141df742ebb56..dc4bf32fc599d5728d41ddeee9de5674b3677bc5 100644 (file)
--- a/view/theme/frio/templates/jot-header.tpl
+++ b/view/theme/frio/templates/jot-header.tpl
@@ -143,10 +143,14 @@ function enableOnUser(){
        $(document).ready(function() {
 
                /* enable tinymce on focus and click */
-               $("#profile-jot-text").focus(enableOnUser);
-               $("#profile-jot-text").click(enableOnUser);
-
+               //$("#profile-jot-text").focus(enableOnUser);
+               //$("#profile-jot-text").click(enableOnUser);
 
+               // When clicking on a forum in acl we should remove the profile jot textarea
+               // default value before inserting the forum mention
+               $("body").on('click', '#jot-modal .acl-list-item.forum', function(){
+                       jotTextOpenUI(document.getElementById("profile-jot-text"));
+               });
 
 
                /* show images / file browser window
@@ -376,8 +380,14 @@ function enableOnUser(){
 
        function addeditortext(data) {
                if(plaintext == 'none') {
+                       // get the textfield
+                       var textfield = document.getElementById("profile-jot-text");
+                       // check if the textfield does have the default-value
+                       jotTextOpenUI(textfield);
+                       // save already existent content
                        var currentText = $("#profile-jot-text").val();
-                       $("#profile-jot-text").val(currentText + data);
+                       //insert the data as new value
+                       textfield.value = currentText + data;
                }
                else
                        tinyMCE.execCommand('mceInsertRawHTML',false,data);
@@ -426,5 +436,6 @@ function enableOnUser(){
                $(function() {Dialog.showJot();});
        }
 
+
 </script>