Changeset 4711

Timestamp:

07/18/2011 11:21:34 PM (13 years ago)

Author:

boonebgorges

Message:

Ensure that autocompleted message recipients can't be duplicated on the Compose screen. Fixes #3352

Location:

trunk/bp-messages/js/autocomplete

Files:

• jquery.autocompletefb.dev.js (modified) (1 diff)
• jquery.autocompletefb.js (modified) (1 diff)

trunk/bp-messages/js/autocomplete/jquery.autocompletefb.dev.js

@@ -53 +53 @@
         var d = String(d).split(' (');
         var un = d[1].substr(0, d[1].length-1);
-        var ln = '#link-' + un;
-        var l = jQuery(ln).attr('href');
-        var v = '<li class="'+f+'" id="un-'+un+'"><span><a href="'+l+'">'+d[0]+'</a></span> <span class="p">X</span></li>';
-        var x = jQuery(settings.inputClass,tmp).before(v);
+        
+        /* Don't add the same user multiple times */
+        if( 0 === jQuery(settings.inputClass).siblings('#un-' + un).length ) {      
+            var ln = '#link-' + un;
+            var l = jQuery(ln).attr('href');
+            var v = '<li class="'+f+'" id="un-'+un+'"><span><a href="'+l+'">'+d[0]+'</a></span> <span class="p">X</span></li>';
+            
+            var x = jQuery(settings.inputClass,tmp).before(v);
+            jQuery('#send-to-usernames').addClass(un);
+                
+            jQuery('.p',x[0].previousSibling).click(function(){
+                acfb.removeFind(this);
+            });
+        } 
+            
+        jQuery(settings.inputClass,tmp).val('');
 
-        jQuery('#send-to-usernames').addClass(un);
-
-        jQuery('.p',x[0].previousSibling).click(function(){
-            acfb.removeFind(this);
-        });
-        jQuery(settings.inputClass,tmp).val('');
     });
 

trunk/bp-messages/js/autocomplete/jquery.autocompletefb.js

@@ -14 +14 @@
  *   http://www.gnu.org/licenses/gpl.html
  */
-jQuery.fn.autoCompletefb=function(b){var c=this;var d={ul:c,urlLookup:[""],acOptions:{},foundClass:".friend-tab",inputClass:".send-to-input"};if(b){jQuery.extend(d,b)}var a={params:d,removeFind:function(e){a.removeUsername(e);jQuery(e).unbind("click").parent().remove();jQuery(d.inputClass,c).focus();return c.acfb},removeUsername:function(f){var e=f.parentNode.id.split("-");jQuery("#send-to-usernames").removeClass(e[1])}};jQuery(d.foundClass+" img.p").click(function(){a.removeFind(this)});jQuery(d.inputClass,c).autocomplete(d.urlLookup,d.acOptions);jQuery(d.inputClass,c).result(function(n,o,m){var m=d.foundClass.replace(/\./,"");var o=String(o).split(" (");var j=o[1].substr(0,o[1].length-1);var k="#link-"+j;var h=jQuery(k).attr("href");var i='<li class="'+m+'" id="un-'+j+'"><span><a href="'+h+'">'+o[0]+'</a></span> <span class="p">X</span></li>';var g=jQuery(d.inputClass,c).before(i);jQuery("#send-to-usernames").addClass(j);jQuery(".p",g[0].previousSibling).click(function(){a.removeFind(this)});jQuery(d.inputClass,c).val("")});jQuery(d.inputClass,c).focus();return a};
+jQuery.fn.autoCompletefb=function(b){var c=this;var d={ul:c,urlLookup:[""],acOptions:{},foundClass:".friend-tab",inputClass:".send-to-input"};if(b){jQuery.extend(d,b)}var a={params:d,removeFind:function(e){a.removeUsername(e);jQuery(e).unbind("click").parent().remove();jQuery(d.inputClass,c).focus();return c.acfb},removeUsername:function(f){var e=f.parentNode.id.split("-");jQuery("#send-to-usernames").removeClass(e[1])}};jQuery(d.foundClass+" img.p").click(function(){a.removeFind(this)});jQuery(d.inputClass,c).autocomplete(d.urlLookup,d.acOptions);jQuery(d.inputClass,c).result(function(n,o,m){var m=d.foundClass.replace(/\./,"");var o=String(o).split(" (");var j=o[1].substr(0,o[1].length-1);if(0===jQuery(d.inputClass).siblings("#un-"+j).length){var k="#link-"+j;var h=jQuery(k).attr("href");var i='<li class="'+m+'" id="un-'+j+'"><span><a href="'+h+'">'+o[0]+'</a></span> <span class="p">X</span></li>';var g=jQuery(d.inputClass,c).before(i);jQuery("#send-to-usernames").addClass(j);jQuery(".p",g[0].previousSibling).click(function(){a.removeFind(this)})}jQuery(d.inputClass,c).val("")});jQuery(d.inputClass,c).focus();return a};