kallithea Changeset - 781b28e55b9e

Changeset - 781b28e55b9e

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Mads Kiilerich - 8 years ago 2017-10-31 03:17:52
mads@kiilerich.com

js: set cursor position after @mention selection

Based on work by Dominik Ruff and Stack Overflow.

1 file changed with 20 insertions and 1 deletions:

kallithea/public/js/base.js

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -1191,25 +1191,25 @@ var MentionsAutoComplete = function ($in @@
     mentionsAC.formatResult = function (oResultData, sQuery, sResultMatch) {
         // use the search string from $inputElement instead of sQuery
         return autocompleteFormatter(oResultData, $container.data('search'), sResultMatch);
+    }
     // Handler for selection of an entry
     if(mentionsAC.itemSelectEvent){
         mentionsAC.itemSelectEvent.subscribe(function (sType, aArgs) {
             var myAC = aArgs[0]; // reference back to the AC instance
             var elLI = aArgs[1]; // reference to the selected LI element
             var oData = aArgs[2]; // object literal of selected item's result data
             myAC.getInputEl().value = $container.data('before') + oData.nname + ' ' + $container.data('after');
-            myAC.getInputEl().focus(); // Y U NO WORK !?
+            _setCaretPosition($(myAC.getInputEl()), myAC.dataSource.before.length + oData.nname.length + 1);
         });
+    }
     // Must match utils2.py MENTIONS_REGEX.
     // Operates on a string from char before @ up to cursor.
     // Check that the char before @ doesn't look like an email address, and match to end of string.
     var mentionRe = new RegExp('(?:^|[^a-zA-Z0-9])@([a-zA-Z0-9][-_.a-zA-Z0-9]*[a-zA-Z0-9])$');
     $inputElement.keyup(function(e){
             var currentMessage = $inputElement.val();
             var currentCaretPosition = $inputElement[0].selectionStart;
@@ @@ -1219,24 +1219,43 @@ var MentionsAutoComplete = function ($in @@
             if(lastAtPos >= 0){
                 // Search from one char before last @ ... if possible
                 var m = mentionRe.exec(messageBeforeCaret.substr(Math.max(0, lastAtPos - 1)));
                 if(m){
                     $container.data('before', currentMessage.substr(0, lastAtPos + 1));
                     $container.data('search', currentMessage.substr(lastAtPos + 1, currentCaretPosition - lastAtPos - 1));
                     $container.data('after', currentMessage.substr(currentCaretPosition));
+                }
+            }
         });
+}
 // Set caret at the given position in the input element
 function _setCaretPosition($inputElement, caretPos) {
     $inputElement.each(function(){
         if(this.createTextRange) { // IE
             var range = this.createTextRange();
             range.move('character', caretPos);
             range.select();
+        }
         else if(this.selectionStart) { // other recent browsers
             this.focus();
             this.setSelectionRange(caretPos, caretPos);
+        }
         else // last resort - very old browser
             this.focus();
     });
+}
 var addReviewMember = function(id,fname,lname,nname,gravatar_link,gravatar_size){
     var displayname = nname;
     if ((fname != "") && (lname != "")) {
         displayname = "{0} {1} ({2})".format(fname, lname, nname);
+    }
     var gravatarelm = gravatar(gravatar_link, gravatar_size, "");
     // WARNING: the HTML below is duplicate with
     // kallithea/templates/pullrequests/pullrequest_show.html
     // If you change something here it should be reflected in the template too.
     var element = (
         '     <li id="reviewer_{2}">\n'+
         '       <span class="reviewers_member">\n'+

0 comments (0 inline, 0 general)