Changeset 7346 for sandbox/2.5.0-expresso1/expressoMail1_2/js/search.js
- Timestamp:
- 10/04/12 10:39:26 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sandbox/2.5.0-expresso1/expressoMail1_2/js/search.js
r7296 r7346 1 1 xhr = false; 2 3 var folder = {}; 2 4 3 5 function searchE() … … 144 146 } 145 147 148 //draws folder list 146 149 searchE.prototype.foldersTree = function() 147 150 { 148 var treeFoldersSearch = new dFTree({name : 'treeFoldersSearch'}); 149 150 var root = new dNode({id : 'root', caption: get_lang('My Folders'), onClick: "ttree.setFolder('root')"}); 151 152 treeFoldersSearch.add(root, 'root'); 153 154 for(var i = 0; i < folders.length ; i++ ) 155 { 156 var nn = new dNode({id:folders[i].folder_id, caption: lang_folder(folders[i].folder_name), plusSign:folders[i].folder_hasChildren, onClick: "ttree.setFolder('"+folders[i].folder_id+"')"}); 151 /*Insere a árvore de diretórios*/ 152 153 var foldersTree = jQuery("#divFoldersSearch") 154 .removeClass('empty-container') 155 //Marcosw início - Adicionado parametro cp_tree3 156 .html(DataLayer.render(BASE_PATH + 'api/templates/foldertree.ejs', {folders: [cp_tree1, cp_tree2, cp_tree3 ]})) 157 //Marcosw fim 158 .find("#foldertree").treeview() 159 .click(function(event) 160 { 161 //request new selected folder messages 162 var target = $(event.target); 163 164 if( target.is('.collapsable-hitarea, .expandable-hitarea, .lastCollapsable, .lastExpandable, .treeview') ) 165 return; 166 167 if( !target.attr('id') ) 168 target = target.parent(); 169 170 if (target.attr('id') == "foldertree") return; 157 171 158 if ( folders[i].folder_parent == '' ) 159 { 160 folders[i].folder_parent = 'root'; 161 } 162 else if ( folders[i].folder_parent.indexOf('user') != -1 ) 163 { 164 //if ( treeFoldersSearch.getNodeById('user') ) 165 { 166 var n_root_shared_folders = new dNode({id:'user', caption:get_lang("Shared Folders"), plusSign:true}); 167 treeFoldersSearch.add( n_root_shared_folders,'root'); 168 } 169 } 170 171 // Ver Ticket #1548 172 if( folders[i].folder_parent != 'root') 173 { 174 var node_parent = treeFoldersSearch.getNodeById(folders[i].folder_parent); 175 176 if( typeof node_parent != 'undefined') 177 { 178 node_parent.plusSign = true; 179 treeFoldersSearch.alter(node_parent); 180 } 181 } 172 folder = {}; 173 folder.id = target.attr('id'); 174 folder.child = target.find('.folder'); 175 folder.caption = target.find('span').attr('title'); 182 176 183 treeFoldersSearch.add( nn, folders[i].folder_parent ); 184 } 185 186 treeFoldersSearch.draw( $("#divFoldersSearch")[0] ); 187 treeFoldersSearch.getNodeById("root")._select(); 188 root.changeState(); 177 $('.filetree span.folder.selected').removeClass('selected'); 178 if(!target.is('#foldertree > .expandable, #foldertree > .collapsable')) 179 $(target).children('.folder').addClass('selected'); 180 181 selectedFolder = { 182 id: folder.id, 183 name: folder.child.attr('title'), 184 'class': folder.child.attr('class') 185 }; 186 }); 187 189 188 } 190 189 … … 1291 1290 { 1292 1291 var sel = Element("sel_search_nm_box1"); 1292 this.name_box_search = folder.id; 1293 1293 1294 1294 if (!proxy_mensagens.is_local_folder(this.name_box_search)) … … 1314 1314 name_box_def = this.name_box_search.substr(final_pos+1); 1315 1315 } 1316 else 1317 name_box_def = this.name_box_search.substr(6);//Retira o 'local_' 1316 else { 1317 name_box_def = folder.caption + " (local)"; //this.name_box_search.substr(6);//Retira o 'local_' 1318 } 1318 1319 } 1319 1320 … … 1582 1583 { 1583 1584 expresso_local_messages.setSortType('SORTDATE'); 1584 tmp = expresso_local_messages.search( local_folders, fields ); 1585 //tmp = expresso_local_messages.search( local_folders, fields ); 1586 expresso_mail_archive.search(local_folders, fields); 1587 tmp = expresso_mail_archive.search_queryresult; 1585 1588 } 1586 1589 … … 1591 1594 } 1592 1595 1593 if ( tmp.length > 0 ) 1594 { 1595 allMsg['gears_num_msgs'] = tmp.length ; 1596 if (tmp) { 1597 if ( tmp.length > 0 ) 1598 { 1599 allMsg['gears_num_msgs'] = tmp.length ; 1600 } 1601 } else { 1602 allMsg['gears_num_msgs'] = 0; 1596 1603 } 1597 1604 … … 1602 1609 else 1603 1610 { 1604 if( ( tmp .length > 0) && ( !data['num_msgs'] ) )1611 if( ( tmp && tmp.length > 0) && ( !data['num_msgs'] ) ) 1605 1612 { 1606 1613 EsearchE.viewLocalMessage(); … … 1612 1619 EsearchE.func_clean(); 1613 1620 } 1614 1615 1621 write_msg( count + " " + get_lang("results found") ); 1616 1622
Note: See TracChangeset
for help on using the changeset viewer.