Changeset 2925 for trunk/jabberit_messenger
- Timestamp:
- 06/14/10 13:59:59 (14 years ago)
- Location:
- trunk/jabberit_messenger
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/jabberit_messenger/inc/controller.xml
r1799 r2925 21 21 <item ref="editSelect" js="editSelect" /> 22 22 <item ref="groups_ldap" js="groups_ldap" /> 23 <item ref="dragdrop" js="dragdrop" /> 23 24 <item ref="images" js="images" /> 24 25 <item ref="ldap" js="ldap" /> -
trunk/jabberit_messenger/inc/jabberit_acl.inc.php
r2897 r2925 83 83 'j.connector', 84 84 'j.xtools', 85 'j.dragdrop', 85 86 'j.makeW', 86 87 'j.ldap', … … 88 89 'j.show_hidden', 89 90 'j.load', 90 'j.editSelect', 91 'j.jsloader' 91 'j.editSelect' 92 92 ); 93 93 … … 109 109 print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/'.$theme.'" >'; 110 110 print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/common.css" >'; 111 print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/button.css" >'; 111 112 print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'templates/default/css/selectEditStyle.css" >'; 112 113 -
trunk/jabberit_messenger/js/dragdrop.js
r1566 r2925 8 8 function _configEvent(pObj, pEvent, pHandler) 9 9 { 10 if ( typeof pObj == 'object' ) 11 { 12 if ( pEvent.substring(0, 2) == 'on' ) 13 pEvent = pEvent.substring(2, pEvent.length); 14 15 if ( arguments.length == 3 ) 10 try 11 { 12 if (typeof pObj == 'object') 16 13 { 17 if ( pObj.addEventListener ) 18 pObj.addEventListener(pEvent, pHandler, false); 19 else if ( pObj.attachEvent ) 20 pObj.attachEvent('on' + pEvent, pHandler); 14 if (pEvent.substring(0, 2) == 'on') 15 pEvent = pEvent.substring(2, pEvent.length); 16 17 if (arguments.length == 3) 18 { 19 if (pObj.addEventListener) 20 pObj.addEventListener(pEvent, pHandler, false); 21 else 22 if (pObj.attachEvent) 23 pObj.attachEvent('on' + pEvent, pHandler); 24 } 25 else 26 { 27 if (arguments.length == 4) 28 { 29 if (pObj.removeEventListener && pObj.removeEventListener != 'undefined') 30 pObj.removeEventListener(pEvent, pHandler, false); 31 else 32 if (pObj.detachEvent) 33 pObj.detachEvent('on' + pEvent, pHandler); 34 } 35 } 21 36 } 22 else if ( arguments.length == 4 ) 23 { 24 if ( pObj.removeEventListener && pObj.removeEventListener != 'undefined') 25 pObj.removeEventListener(pEvent, pHandler, false); 26 else if ( pObj.detachEvent ) 27 pObj.detachEvent('on' + pEvent, pHandler); 28 } 29 } 37 } 38 catch(e){} 30 39 } 31 40 -
trunk/jabberit_messenger/js/load.js
r2810 r2925 436 436 winBuild(_win_preferences); 437 437 438 var _preferences = function() 439 { 440 // Element openWindowJabberit 441 var value1 = flagOpenIM.split(':'); 442 var element1 = document.getElementById(value1[0]); 443 var valueSelect1 = value1[1]; 444 445 for(var i = 0; i < element1.options.length; i++) 446 if( element1.options[i].value == valueSelect1 ) 447 element1.options[i].selected = true; 448 449 450 // Element openWindowJabberitPopUp 451 var value2 = flagOpenPopup.split(':'); 452 var element2 = document.getElementById(value2[0]); 453 var valueSelect2 = value2[1]; 438 // Element openWindowJabberit 439 var value1 = flagOpenIM.split(':'); 440 var element1 = document.getElementById(value1[0]); 441 var valueSelect1 = value1[1]; 442 443 for(var i = 0; i < element1.options.length; i++) 444 if( element1.options[i].value == valueSelect1 ) 445 element1.options[i].selected = true; 446 447 448 // Element openWindowJabberitPopUp 449 var value2 = flagOpenPopup.split(':'); 450 var element2 = document.getElementById(value2[0]); 451 var valueSelect2 = value2[1]; 452 453 for(var i = 0; i < element2.options.length; i++) 454 if( element2.options[i].value == valueSelect2 ) 455 element2.options[i].selected = true; 454 456 455 for(var i = 0; i < element2.options.length; i++) 456 if( element2.options[i].value == valueSelect2 ) 457 element2.options[i].selected = true; 458 459 // Element flagAwayIM 460 var value3 = flagAwayIM.split(':'); 461 var element3 = document.getElementById(value3[0]); 462 element3.value = value3[1]; 463 464 465 var _pButtons = { 466 'lang1' : jabberitGetLang('Save'), 467 'lang2' : jabberitGetLang('Close'), 468 'onclickClose' : 'winBuild("jabberit_preferences","remove");', 469 'onclickSubmit' : 'javascript:loadscript.setPrefe();' 470 }; 471 472 document.getElementById('buttons_preferences_jabberit').innerHTML = Xtools.parse(Xtools.xml('buttons_main'), 'buttons.xsl', _pButtons); 473 } 474 475 setTimeout(function(){ _preferences();}, 220); 457 // Element flagAwayIM 458 var value3 = flagAwayIM.split(':'); 459 var element3 = document.getElementById(value3[0]); 460 element3.value = value3[1]; 461 462 463 var _pButtons = 464 { 465 'lang1' : jabberitGetLang('Save'), 466 'lang2' : jabberitGetLang('Close'), 467 'onclickClose' : 'winBuild("jabberit_preferences","remove");', 468 'onclickSubmit' : 'javascript:loadscript.setPrefe();' 469 }; 470 471 document.getElementById('buttons_preferences_jabberit').innerHTML = Xtools.parse(Xtools.xml('buttons_main'), 'buttons.xsl', _pButtons); 472 476 473 } 477 474 … … 583 580 height : sizeW.h, 584 581 top : 60, 585 left : pLeft, 582 left : -1500, 583 leftOld : 50, 586 584 draggable : true, 587 585 visible : "display", … … 592 590 content : "" 593 591 }; 592 594 593 } 595 594 -
trunk/jabberit_messenger/js/makeW.js
r2226 r2925 5 5 var path = path_jabberit; 6 6 7 var _dialogs = [ ]; 8 7 9 function build(pObj) 8 10 { 9 11 var _window = getElement( pObj.id_window + '__parent'); 10 Xtools = new JITXtools(path); 12 Xtools = new JITXtools(path); 11 13 12 14 if( _window == null ) … … 30 32 _window.setAttribute("leftOld", pObj.left + "px" ); 31 33 34 if( pObj.leftOld ) 35 _window.setAttribute("leftOld", pObj.leftOld + "px" ); 36 32 37 window.document.body.insertBefore( _window, document.body.lastChild ); 33 38 34 getElement(pObj.id_window + '__content').innerHTML = pObj.content; 39 if ( pObj.content.constructor == String ) 40 getElement(pObj.id_window + '__content').innerHTML = pObj.content; 41 else 42 getElement(pObj.id_window + '__content').appendChild( pObj.content ); 35 43 44 _dialogs[ pObj.id_window ] = getElement(pObj.id_window + '__content').firstChild; 45 36 46 if( pObj.draggable ) 37 47 { … … 39 49 dragDrop.set( pObj.id_window ); 40 50 } 51 41 52 } 42 53 else 43 54 { 44 load(pObj.id_window, "display"); 55 if ( pObj.barejid && loadscript.windowPOPUP( pObj.barejid ) ) 56 return false; 57 58 load(pObj.id_window, "display"); 45 59 } 46 60 } … … 53 67 function load( pId, pVisible ) 54 68 { 55 var winM= document.getElementById( pId + '__parent')69 var _window = document.getElementById( pId + '__parent') 56 70 57 if( winM!= null )71 if( _window != null ) 58 72 { 59 73 if ( pVisible == "display" ) 60 74 { 61 if(winM.getAttribute("leftOld") != "-1500px") 62 winM.style.left = winM.getAttribute("leftOld"); 63 else 64 winM.style.left = "70px"; 65 } 75 if( _window.style.left == "-1500px" ) 76 _window.style.left = _window.getAttribute("leftOld"); 77 } 66 78 67 79 if ( pVisible == "hidden") 68 80 { 69 winM.setAttribute("leftOld" , winM.style.left );70 winM.style.left = "-1500px";81 _window.setAttribute("leftOld" , _window.style.left ); 82 _window.style.left = "-1500px"; 71 83 } 72 84 73 85 if( pVisible == "remove" ) 74 86 { 75 document.body.removeChild( winM);87 document.body.removeChild( _window ); 76 88 } 77 89 } … … 82 94 if( arguments.length > 0 ) 83 95 { 96 var pId = null; 84 97 if( arguments.length == 1 ) 85 98 { 86 JSLoader.load([path + "js/dragdrop.js"]);87 JSLoader.load([path + "templates/default/css/button.css"])88 89 99 var obj = arguments[0]; 90 91 setTimeout(function(){ build(obj);}, 200);100 pId = obj.id_window 101 build(obj); 92 102 } 93 103 94 104 if( arguments.length == 2 ) 95 105 { 96 load( arguments[0], arguments[1]);106 load( ( pId = arguments[0] ), arguments[1]); 97 107 } 98 } 108 } 109 110 return ( new function( ) 111 { 112 this.content = function( ) 113 { 114 if ( arguments.length ) 115 getElement( pId + '__content').appendChild( _dialogs[ pId ] ); 116 117 return _dialogs[ obj.id_window ]; 118 }; 119 } ); 99 120 } 100 121 … … 108 129 { 109 130 if( arguments.length == 1 ) 110 _win = newbWindow( arguments[0] );131 return bWindow( arguments[0] ); 111 132 112 133 if( arguments.length == 2 ) 113 _win = new bWindow( arguments[0], arguments[1] );134 return bWindow( arguments[0], arguments[1]); 114 135 } 136 return false; 115 137 }
Note: See TracChangeset
for help on using the changeset viewer.