Changeset 342 for trunk/expressoMail1_2/js/QuickCatalogSearch.js

Timestamp:

07/01/08 11:40:00 (16 years ago)

Author:

niltonneto

Message:

Algumas validações de condições nulas, para não gerar erro.
Otimizações para eliminar códigos duplicados.
Outros ajustes.

File:

• trunk/expressoMail1_2/js/QuickCatalogSearch.js (modified) (7 diffs)

trunk/expressoMail1_2/js/QuickCatalogSearch.js

@@ -139 +139 @@
                         Op.value = '"' + data[i].cn + '" ' + '<' + data[i].mail + '>';
                         cmb.options.add(Op);
-
                 }
                 cmb.options[0].selected = true;
@@ -153 +152 @@
                                                         
                 if(! this.arrayWin[div.id]) {
-                        div.style.width = "700px"; //na comunidade valor eh 600px
+                        div.style.width = "700px";
                         div.style.height = "230px";
                         var title = get_lang('The results were found in the Global Catalog')+':';
@@ -226 +225 @@
                 el.style.visibility = "hidden";
                 el.style.position = "absolute";
-                el.style.width = "700px"; // na comunidade valor eh 495px
+                el.style.width = "700px";
                 el.style.height = is_ie ? "360px" : "375px";            
                 el.style.left = "0px";
@@ -239 +238 @@
                                         '<tr><td><select style="width:150px" id="select_catalog" name="select_catalog" onchange="javascript:QuickCatalogSearch.update_organizations();"></select>&nbsp'+
                                         '<select id="select_organization" style="width:100px" name="select_organization"></select>&nbsp;'+   
-                                        '<input type="text" id="search_for" name="search_for" value="" size="10" maxlength="15"/>&nbsp;<input type="button" onclick="QuickCatalogSearch.searchCatalogList(true)" class="button" value="'+get_lang('Search')+'">&nbsp;<input style="display:none" type="button" onclick="QuickCatalogSearch.searchCatalogList(false)" class="button" value="'+get_lang('List All')+'"></td></tr>'+
-                                           '<tr><td><input onclick="javascript:QuickCatalogSearch.changeOptions(this.value)" id="type" type="radio" name="type" value="l"/>'+get_lang('Public Lists')+'&nbsp;&nbsp;<input type="radio" name="type" value="u" onclick="javascript:QuickCatalogSearch.changeOptions(this.value)" checked/>'+get_lang('Users')+'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+
+                                        '<input type="text" id="search_for" name="search_for" value="" size="30" maxlength="20"/>&nbsp;<input type="button" onclick="QuickCatalogSearch.searchCatalogList(true)" class="button" value="'+get_lang('Search')+'">&nbsp;<input style="display:none" type="button" onclick="QuickCatalogSearch.searchCatalogList(false)" class="button" value="'+get_lang('List All')+'"></td></tr>'+
+                                           //'<tr><td><input onclick="javascript:QuickCatalogSearch.changeOptions(this.value)" id="type" type="radio" name="type" value="l"/>'+get_lang('Public Lists')+'&nbsp;&nbsp;<input type="radio" name="type" value="u" onclick="javascript:QuickCatalogSearch.changeOptions(this.value)" checked/>'+get_lang('Users')+'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'+
                                            '<span style="visibility:hidden;background:#cc4444" id=msg_search>&nbsp;&nbsp;<font face="Verdana" size="1" color="WHITE">'+get_lang('Search in Catalog')+'...</font>&nbsp;</span></td></tr>'+
                                            '<tr><td>'+
@@ -298 +297 @@
                         var user_catalog = "Catalogo Geral";
 
-                        for(i = 0; i < data.length; i++) {
-                        
-                                Element('select_catalog').options[i] = new Option(data[i],i);
-                                if(user_catalog.toUpperCase() == data[i].toUpperCase())
-                                        Element('select_catalog').options[i].selected = true;
+                        if(data.length <= 1) 
+                                Element('select_catalog').style.display = 'none';
+                        else {
+                                for(i = 0; i < data.length; i++) {              
+                                        Element('select_catalog').options[i] = new Option(data[i],i);
+                                        if(user_catalog.toUpperCase() == data[i].toUpperCase())
+                                                Element('select_catalog').options[i].selected = true;
+                                }
                         }
                 }
                 cExecute ("$this.ldap_functions.get_catalogs", handler_catalogs);               
-
+                
                 this.update_organizations();
         
@@ -383 +385 @@
                 
                 var handler_org = function(data){
-                        Element('select_organization').options[0] = new Option('todos','todos');
+                        Element('select_organization').options[0] = new Option(get_lang('all'),'all');
                         if (data != null){
                         
                         for(x = 0; x < data.length; x++) {
-                                Element('select_organization').options[x+1] = new Option(data[x],data[x]);
+                                Element('select_organization').options[x+1] = new Option(data[x].toUpperCase(),data[x]);
                                 }
                         }
@@ -512 +514 @@
                                 }
                                 else{
-
+        
                                 /*******************************************************************************************/
                                 /* O resultado pratico do bloco de codigo a seguir eh a exibicao dos valores em tela,