Changeset 3871 for branches/2.2/expressoMail1_2/js/common_functions.js

Timestamp:

03/15/11 14:46:39 (13 years ago)

Author:

niltonneto

Message:

Ticket #1654 - Corrigido funcionamento incorreto ao executar pesquisa rápida de contatos.

File:

• branches/2.2/expressoMail1_2/js/common_functions.js (modified) (2 diffs)

branches/2.2/expressoMail1_2/js/common_functions.js

@@ -520 +520 @@
                 return;
         }
+        if ((field != 'null') && (ID != 'null'))
+        {
+                connector.loadScript("QuickCatalogSearch");
+                if (typeof(QuickCatalogSearch) == 'undefined'){
+                        setTimeout('emQuickSearch("'+emailList+'", "'+field+'", "'+ID+'")',500);
+                        return false;
+                }
+        }
+        else
+        {
+                connector.loadScript("QuickSearchUser");
+                if (typeof(QuickSearchUser) == 'undefined'){
+                        setTimeout('emQuickSearch("'+emailList+'", "'+field+'", "'+ID+'")',500);
+                        return false;
+                }
+        }       
 
         var handler_emQuickSearch = function(data)
@@ -536 +552 @@
                         if ((field != 'null') && (ID != 'null'))
                         {
-                                connector.loadScript("QuickCatalogSearch");
-                                if (typeof(QuickCatalogSearch) == 'undefined'){
-                                        setTimeout('emQuickSearch("'+emailList+'", "'+field+'", "'+ID+'")',500);
-                                        return false;
-                                }
                                 QuickCatalogSearch.showList(data, quickSearchKeyBegin, quickSearchKeyEnd);
                         }
                         else
                         {
-                                connector.loadScript("QuickSearchUser");
-                                if (typeof(QuickSearchUser) == 'undefined'){
-                                        setTimeout('emQuickSearch("'+emailList+'", "'+field+'", "'+ID+'")',500);
-                                        return false;
-                                }
                                 QuickSearchUser.showList(data);
                         }