Merged r20009 from trunk to 4.1-stable (#33958).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@20011 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/public/javascripts/jstoolbar/jstoolbar.js b/public/javascripts/jstoolbar/jstoolbar.js
index dccff99521015b7a2f28bd1e866bdd23f924233e..a815ef57058a24ce6e968a1ad2729fd0b22a233c 100644 (file)
--- a/public/javascripts/jstoolbar/jstoolbar.js
+++ b/public/javascripts/jstoolbar/jstoolbar.js
@@ -338,7 +338,7 @@ jsToolBar.prototype = {
     } else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
       this.textarea.value = this.textarea.value.substring(0, start) + subst +
       this.textarea.value.substring(end);
-      if (sel) {
+      if (sel || (!prefix && start === end)) {
         this.textarea.setSelectionRange(start + subst.length, start + subst.length);
       } else {
         this.textarea.setSelectionRange(start + prefix.length, start + prefix.length);