Changeset - c1784f495867
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Thomas De Schampheleire - 10 years ago 2015-06-26 22:07:00
thomas.de.schampheleire@gmail.com
autocomplete: clean up handlers for itemSelectEvent

The handlers that execute when an autocompleted item is selected are really
specific and cannot be factored out. Nevertheless, some cleanup:

- rationalize indentation
- remove redundant copy/pasted comments
- remove redundant group handling in MentionsAutoComplete
- remove redundant checks on 'oData.nname != undefined', used to
differentiate user vs. group completion, in places that only allow user
autocompletion
1 file changed with 36 insertions and 46 deletions:
kallithea/public/js/base.js
36
46
0 comments (0 inline, 0 general)
kallithea/public/js/base.js
➞
Show inline comments
 
@@ -1263,44 +1263,44 @@ var _MembersAutoComplete = function (div
 

			




	
	
	
		
 
    // Instantiate AutoComplete for owner

			




	
	
	
		
 
    var ownerAC = new YAHOO.widget.AutoComplete("user", "owner_container", ownerDS);

			




	
	
	
		
 
    ownerAC.useShadow = false;

			




	
	
	
		
 
    ownerAC.resultTypeList = false;

			




	
	
	
		
 
    ownerAC.animVert = false;

			




	
	
	
		
 
    ownerAC.animHoriz = false;

			




	
	
	
		
 
    ownerAC.animSpeed = 0.1;

			




	
	
	
		
 

			




	
	
	
		
 
    membersAC.formatResult = autocompleteFormatter;

			




	
	
	
		
 
    ownerAC.formatResult = autocompleteFormatter;

			




	
	
	
		
 

			




	
	
	
		
 
    var myHandler = function (sType, aArgs) {

			




	
	
	
		
 
            var nextId = divid.split('perm_new_member_name_')[1];

			




	
	
	
		
 
            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

			




	
	
	
		
 
            //fill the autocomplete with value

			




	
	
	
		
 
            if (oData.nname != undefined) {

			




	
	
	
		
 
                //users

			




	
	
	
		
 
                myAC.getInputEl().value = oData.nname;

			




	
	
	
		
 
                $('#perm_new_member_type_'+nextId).val('user');

			




	
	
	
		
 
            } else {

			




	
	
	
		
 
                //groups

			




	
	
	
		
 
                myAC.getInputEl().value = oData.grname;

			




	
	
	
		
 
                $('#perm_new_member_type_'+nextId).val('users_group');

			




	
	
	
		
 
            }

			




	
	
	
		
 
        };

			




	
	
	
		
 

			




	
	
	
		
 
    membersAC.itemSelectEvent.subscribe(myHandler);

			




	
	
	
		
 
    // Handler for selection of an entry

			




	
	
	
		
 
    var itemSelectHandler = function (sType, aArgs) {

			




	
	
	
		
 
        var nextId = divid.split('perm_new_member_name_')[1];

			




	
	
	
		
 
        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

			




	
	
	
		
 
        //fill the autocomplete with value

			




	
	
	
		
 
        if (oData.nname != undefined) {

			




	
	
	
		
 
            //users

			




	
	
	
		
 
            myAC.getInputEl().value = oData.nname;

			




	
	
	
		
 
            $('#perm_new_member_type_'+nextId).val('user');

			




	
	
	
		
 
        } else {

			




	
	
	
		
 
            //groups

			




	
	
	
		
 
            myAC.getInputEl().value = oData.grname;

			




	
	
	
		
 
            $('#perm_new_member_type_'+nextId).val('users_group');

			




	
	
	
		
 
        }

			




	
	
	
		
 
    };

			




	
	
	
		
 
    membersAC.itemSelectEvent.subscribe(itemSelectHandler);

			




	
	
	
		
 
    if(ownerAC.itemSelectEvent){

			




	
	
	
		
 
        ownerAC.itemSelectEvent.subscribe(myHandler);

			




	
	
	
		
 
        ownerAC.itemSelectEvent.subscribe(itemSelectHandler);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    return {

			




	
	
	
		
 
        memberDS: memberDS,

			




	
	
	
		
 
        ownerDS: ownerDS,

			




	
	
	
		
 
        membersAC: membersAC,

			




	
	
	
		
 
        ownerAC: ownerAC

			




	
	
	
		
 
    };

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
var MentionsAutoComplete = function (divid, cont, users_list) {

			




	
	
	
		
 

			




	
	
		
 
@@ -1329,46 +1329,39 @@ var MentionsAutoComplete = function (div

			




	
	
	
		
 
    ownerAC.animHoriz = false;

			




	
	
	
		
 
    ownerAC.animSpeed = 0.1;

			




	
	
	
		
 

			




	
	
	
		
 
    // Custom formatter to highlight the matching letters

			




	
	
	
		
 
    ownerAC.formatResult = function (oResultData, sQuery, sResultMatch) {

			




	
	
	
		
 
        var org_sQuery = sQuery;

			




	
	
	
		
 
        if (this.dataSource.mentionQuery != null) {

			




	
	
	
		
 
            sQuery = this.dataSource.mentionQuery;

			




	
	
	
		
 
        }

			




	
	
	
		
 
        return autocompleteFormatter(oResultData, sQuery, sResultMatch);

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // Handler for selection of an entry

			




	
	
	
		
 
    if(ownerAC.itemSelectEvent){

			




	
	
	
		
 
        ownerAC.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

			




	
	
	
		
 
            //fill the autocomplete with value

			




	
	
	
		
 
            if (oData.nname != undefined) {

			




	
	
	
		
 
                //users

			




	
	
	
		
 
                //Replace the mention name with replaced

			




	
	
	
		
 
                var re = new RegExp();

			




	
	
	
		
 
                var org = myAC.getInputEl().value;

			




	
	
	
		
 
                var chunks = myAC.dataSource.chunks

			




	
	
	
		
 
                // replace middle chunk(the search term) with actuall  match

			




	
	
	
		
 
                chunks[1] = chunks[1].replace('@'+myAC.dataSource.mentionQuery,

			




	
	
	
		
 
                                              '@'+oData.nname+' ');

			




	
	
	
		
 
                myAC.getInputEl().value = chunks.join('')

			




	
	
	
		
 
                myAC.getInputEl().focus(); // Y U NO WORK !?

			




	
	
	
		
 
            } else {

			




	
	
	
		
 
                //groups

			




	
	
	
		
 
                myAC.getInputEl().value = oData.grname;

			




	
	
	
		
 
                $('#perm_new_member_type').val('users_group');

			




	
	
	
		
 
            }

			




	
	
	
		
 
            //Replace the mention name with replaced

			




	
	
	
		
 
            var re = new RegExp();

			




	
	
	
		
 
            var org = myAC.getInputEl().value;

			




	
	
	
		
 
            var chunks = myAC.dataSource.chunks

			




	
	
	
		
 
            // replace middle chunk(the search term) with actuall  match

			




	
	
	
		
 
            chunks[1] = chunks[1].replace('@'+myAC.dataSource.mentionQuery,

			




	
	
	
		
 
                                          '@'+oData.nname+' ');

			




	
	
	
		
 
            myAC.getInputEl().value = chunks.join('')

			




	
	
	
		
 
            myAC.getInputEl().focus(); // Y U NO WORK !?

			




	
	
	
		
 
        });

			




	
	
	
		
 
    }

			




	
	
	
		
 

			




	
	
	
		
 
    // in this keybuffer we will gather current value of search !

			




	
	
	
		
 
    // since we need to get this just when someone does `@` then we do the

			




	
	
	
		
 
    // search

			




	
	
	
		
 
    ownerAC.dataSource.chunks = [];

			




	
	
	
		
 
    ownerAC.dataSource.mentionQuery = null;

			




	
	
	
		
 

			




	
	
	
		
 
    ownerAC.get_mention = function(msg, max_pos) {

			




	
	
	
		
 
        var org = msg;

			




	
	
	
		
 
        // Must match utils2.py MENTIONS_REGEX.

			




	
	
		
 
@@ -1468,39 +1461,36 @@ var PullRequestAutoComplete = function (

			




	
	
	
		
 
    var reviewerAC = new YAHOO.widget.AutoComplete(divid, cont, ownerDS);

			




	
	
	
		
 
    reviewerAC.useShadow = false;

			




	
	
	
		
 
    reviewerAC.resultTypeList = false;

			




	
	
	
		
 
    reviewerAC.suppressInputUpdate = true;

			




	
	
	
		
 
    reviewerAC.animVert = false;

			




	
	
	
		
 
    reviewerAC.animHoriz = false;

			




	
	
	
		
 
    reviewerAC.animSpeed = 0.1;

			




	
	
	
		
 

			




	
	
	
		
 
    reviewerAC.formatResult = autocompleteFormatter;

			




	
	
	
		
 

			




	
	
	
		
 
    //members cache to catch duplicates

			




	
	
	
		
 
    reviewerAC.dataSource.cache = [];

			




	
	
	
		
 
    // hack into select event

			




	
	
	
		
 

			




	
	
	
		
 
    // Handler for selection of an entry

			




	
	
	
		
 
    if(reviewerAC.itemSelectEvent){

			




	
	
	
		
 
        reviewerAC.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

			




	
	
	
		
 

			




	
	
	
		
 
            //fill the autocomplete with value

			




	
	
	
		
 
            if (oData.nname != undefined) {

			




	
	
	
		
 
                addReviewMember(oData.id, oData.fname, oData.lname, oData.nname,

			




	
	
	
		
 
                                oData.gravatar_lnk, oData.gravatar_size);

			




	
	
	
		
 
                myAC.dataSource.cache.push(oData.id);

			




	
	
	
		
 
                $('#user').val('');

			




	
	
	
		
 
            }

			




	
	
	
		
 
    

			




	
	
	
		
 
            addReviewMember(oData.id, oData.fname, oData.lname, oData.nname,

			




	
	
	
		
 
                            oData.gravatar_lnk, oData.gravatar_size);

			




	
	
	
		
 
            myAC.dataSource.cache.push(oData.id);

			




	
	
	
		
 
            $('#user').val('');

			




	
	
	
		
 
        });

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/**

			




	
	
	
		
 
 * Activate .quick_repo_menu

			




	
	
	
		
 
 */

			




	
	
	
		
 
var quick_repo_menu = function(){

			




	
	
	
		
 
    $(".quick_repo_menu").mouseenter(function(e) {

			




	
	
	
		
 
            var $menu = $(e.currentTarget).children().first().children().first();

			




	
	
	
		
 
            if($menu.hasClass('hidden')){

			




	
	
	
		
 
                $menu.removeClass('hidden').addClass('active');

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.