Changeset 4608 for branches/2.2.0.1
- Timestamp:
- 06/14/11 14:46:38 (13 years ago)
- Location:
- branches/2.2.0.1
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.0.1/expressoMail1_2/js/QuickCatalogSearch.js
r4037 r4608 217 217 title_text_color: 'white', 218 218 button_x_img: '../phpgwapi/images/winclose.gif', 219 border: true }); 219 border: true, 220 onclose: 'QuickCatalogSearch.restoreShortcuts("'+ div.id +'")' }); 220 221 221 222 this.arrayWin[div.id] = win; … … 228 229 win.open(); 229 230 document.getElementById('select_QuickCatalogSearch').focus(); 231 232 if(is_ie){ 233 shortcut.remove('down'); 234 shortcut.remove('up'); 235 shortcut.remove('return'); 236 } 230 237 } 231 238 … … 248 255 this.arrayWin['window_QuickCatalogSearch_A'].close(); 249 256 document.getElementById("window_QuickCatalogSearch").style.visibility = "hidden"; 250 } 257 shortcut.add("down",function(){select_msg('null', 'down');},{'disable_in_input':false}); 258 shortcut.add("up",function(){select_msg('null', 'up');},{'disable_in_input':false}); 259 shortcut.add("return",function(){ 260 if ( Element('border_id_0').className==='menu-sel' ) 261 { 262 all_messages = Element('tbody_box').childNodes; 263 for (var i=0; i < all_messages.length; i++) 264 { 265 if ( exist_className(all_messages[i], 'selected_shortcut_msg') ) 266 { 267 Element("td_who_" + all_messages[i].id).onclick(); 268 return; 269 } 270 } 271 } 272 },{'disable_in_input':true}); 273 } 274 275 emQuickCatalogSearch.prototype.restoreShortcuts = function(id) { 276 277 var search_win = document.getElementById(id); 278 if (search_win.style.visibility == 'visible') 279 { 280 shortcut.add("down",function(){select_msg('null', 'down');},{'disable_in_input':false}); 281 shortcut.add("up",function(){select_msg('null', 'up');},{'disable_in_input':false}); 282 shortcut.add("return",function(){ 283 if ( Element('border_id_0').className==='menu-sel' ) 284 { 285 all_messages = Element('tbody_box').childNodes; 286 for (var i=0; i < all_messages.length; i++) 287 { 288 if ( exist_className(all_messages[i], 'selected_shortcut_msg') ) 289 { 290 Element("td_who_" + all_messages[i].id).onclick(); 291 return; 292 } 293 } 294 } 295 },{'disable_in_input':true}); 296 } 297 search_win.style.visibility = 'hidden'; 298 299 } 251 300 252 301 emQuickCatalogSearch.prototype.close_window = function(id) { 253 302 this.arrayWin[id].close(); 254 303 var group_values = Element('list_values'); 255 var user_values = Element('user_values'); 304 var user_values = Element('user_values'); 256 305 } 257 306 emQuickCatalogSearch.prototype.showCatalogList = function (border_id){ … … 587 636 588 637 /* Build the Object */ 589 varQuickCatalogSearch;638 //QuickCatalogSearch; 590 639 QuickCatalogSearch = new emQuickCatalogSearch(); -
branches/2.2.0.1/expressoMail1_2/js/shortcut.js
r3683 r4608 131 131 132 132 var modifiers = { 133 shift: { 134 ctrl : { 135 alt : { 136 meta : { 133 shift: {wanted:false, pressed:false}, 134 ctrl : {wanted:false, pressed:false}, 135 alt : {wanted:false, pressed:false}, 136 meta : {wanted:false, pressed:false} //Meta is Mac specific 137 137 }; 138 138 … … 246 246 if (arrayJSWin[window].visible) 247 247 { 248 arrayJSWin[window].close(); 248 arrayJSWin[window].close(); 249 var search_win = document.getElementById( 'window_QuickCatalogSearch' ); 250 search_win.style.visibility = 'hidden'; 249 251 window_closed = true; 250 252 } 251 253 } 254 252 255 if (!window_closed) 253 256 delete_border(get_msg_id(), 'false'); 254 257 },{'disable_in_input':false}); 255 258 256 shortcut.add("I",function(){ print_all(); },{'disable_in_input':true});257 shortcut.add("E",function(){ exec_msg_action('forward');},{'disable_in_input':true});258 shortcut.add("R",function(){ exec_msg_action('reply');},{'disable_in_input':true});259 shortcut.add("O",function(){ show_head_option();},{'disable_in_input':true});260 shortcut.add("M",function(){ show_address_full();},{'disable_in_input':true});259 shortcut.add("I",function(){print_all();},{'disable_in_input':true}); 260 shortcut.add("E",function(){exec_msg_action('forward');},{'disable_in_input':true}); 261 shortcut.add("R",function(){exec_msg_action('reply');},{'disable_in_input':true}); 262 shortcut.add("O",function(){show_head_option();},{'disable_in_input':true}); 263 shortcut.add("M",function(){show_address_full();},{'disable_in_input':true}); 261 264 262 265 shortcut.add("Delete",function(){ … … 296 299 ,{'disable_in_input':true}); 297 300 298 shortcut.add("Ctrl+Up",function(){ exec_msg_action('previous');select_msg('null', 'up', true);},{'disable_in_input':true});299 shortcut.add("Ctrl+Down",function(){ exec_msg_action('next');select_msg('null', 'down', true);},{'disable_in_input':true});301 shortcut.add("Ctrl+Up",function(){exec_msg_action('previous');select_msg('null', 'up', true);},{'disable_in_input':true}); 302 shortcut.add("Ctrl+Down",function(){exec_msg_action('next');select_msg('null', 'down', true);},{'disable_in_input':true}); 300 303 301 304 if (is_ie) 302 305 { 303 shortcut.add("down",function(){ select_msg('null', 'down'); },{'disable_in_input':false}); 304 shortcut.add("up",function(){ select_msg('null', 'up'); },{'disable_in_input':false}); 305 306 //********************** 307 shortcut.add('up', function() 308 { 309 var search_in_focus = false; 310 var search_win = document.getElementById( 'window_QuickCatalogSearch' ); 311 if ( search_win && search_win.style.visibility == 'visible' ) 312 search_in_focus = true; 313 314 if ( !search_in_focus ) 315 select_msg('null', 'up'); 316 else 317 shortcut.remove('up'); 318 },{'disable_in_input':false}); 319 320 321 shortcut.add('down', function() 322 { 323 var search_in_focus = false; 324 var search_win = document.getElementById( 'window_QuickCatalogSearch' ); 325 if ( search_win && search_win.style.visibility == 'visible' ) 326 search_in_focus = true; 327 328 if ( !search_in_focus ) 329 select_msg('null', 'down'); 330 else 331 shortcut.remove('down'); 332 },{'disable_in_input':false}); 333 334 //**************** 335 306 336 shortcut.add("Shift+down",function(){ 307 337 if ( Element('border_id_0').className==='menu-sel' ) … … 326 356 else 327 357 { 328 shortcut.add("down",function(){ 329 shortcut.add("up",function(){ 358 shortcut.add("down",function(){select_msg('null', 'down');},{'type':'keypress', 'disable_in_input':false}); 359 shortcut.add("up",function(){select_msg('null', 'up');},{'type':'keypress', 'disable_in_input':false}); 330 360 331 361 shortcut.add("Shift+down",function(){ … … 363 393 } 364 394 } 365 } 366 ,{'disable_in_input':true}); 395 },{'disable_in_input':true}); 367 396 368 397 shortcut.add("f9",function(){ -
branches/2.2.0.1/phpgwapi/js/dJSWin/dJSWin.js
r4034 r4608 58 58 if (is_ie) 59 59 { 60 this.onclose = params.onclose; 60 61 this.winContainer = document.createElement('iframe'); 61 62 } … … 172 173 this.buttons.xDIV.style.left = parseInt(params['width']) - 13 + 'px'; 173 174 this.buttons.xDIV.style.zIndex = '1'; 174 this.buttons.xDIV.onclick = function() {_this.close(); 175 this.buttons.xDIV.onclick = function() {_this.close();_this.state = 2;if(document.getElementById("window_QuickCatalogSearch")) document.getElementById("window_QuickCatalogSearch").style.visibility = "hidden";}; 175 176 176 177 this.content.style.visibility = 'hidden'; … … 335 336 var _this = this; 336 337 _this.state = 0; 338 339 if (typeof this.onclose != 'undefined') 340 { 341 eval(this.onclose); 342 } 343 337 344 dd.elements[this.title.id].hide(); 338 345 /* Turn the attribute visible false */ … … 342 349 divBan.removeAttribute('onclick'); 343 350 if (is_ie){ 344 divBan.onclick = function(){}; 345 } 351 divBan.onclick = function(){}; 352 } 346 353 } 347 354
Note: See TracChangeset
for help on using the changeset viewer.