Changeset 3569
- Timestamp:
- 12/09/10 16:47:45 (13 years ago)
- Location:
- branches/2.2/filemanager
- Files:
-
- 3 added
- 1 deleted
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/filemanager/inc/class.uifilemanager.inc.php
r3568 r3569 350 350 351 351 $js = "var path_filemanager = '".$webserver_url."';"; 352 $js .= "var theme_filemanager = '".$theme."';";353 352 354 353 echo "<script type='text/javascript'>".$js."</script>"; 355 354 356 /*Expresso Window*/ 355 // Expresso Window - CSS 356 print '<link rel="stylesheet" type="text/css" href="' . $webserver_url . 'tp/expressowindow/css/'.$theme.'" >'; 357 358 // Expresso Window - JS 357 359 echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/xtools.js'></script>"; 358 360 echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/jsloader.js'></script>"; 359 361 echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/makeW.js'></script>"; 360 362 echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/dragdrop.js'></script>"; 363 echo "<script src='".$GLOBALS['phpgw_info']['flags']['currentapp']."/tp/expressowindow/js/show_hidden.js'></script>"; 361 364 362 365 echo "<script src='./phpgwapi/js/dftree/dftree.js'></script>"; … … 1354 1357 if($img) 1355 1358 { 1356 return '<span name="'.$link.'" class="toolButton" onclick="toolbar.control(\''.$link.'\' );" title="'.$description.'"><img src="'.$image.'" alt="'.$description.'"/></a><small>'.$description.'</small></span>';1359 return '<span name="'.$link.'" class="toolButton" onclick="toolbar.control(\''.$link.'\',this);" title="'.$description.'"><img src="'.$image.'" alt="'.$description.'"/></a><small>'.$description.'</small></span>'; 1357 1360 } 1358 1361 } -
branches/2.2/filemanager/js/common_functions.js
r3436 r3569 1 function load(path,el){ 1 2 var Xtools = null; 3 4 function load(path,el) 5 { 2 6 currentPath = path; 3 7 contentFolders = document.getElementById('content_folders'); … … 16 20 } 17 21 18 function check(element){ 22 function check(element) 23 { 19 24 element.firstChild.firstChild.checked = true; 20 25 } 21 26 22 function validateFileExtension(fileName){ 27 function validateFileExtension(fileName) 28 { 23 29 var error_flag = false; 24 30 var fileExtension = fileName.split("."); … … 42 48 } 43 49 44 function get_lang(_key){ 50 function get_lang(_key) 51 { 45 52 var key = _key.toLowerCase(); 46 53 if(array_lang[key]) … … 57 64 58 65 59 function newEmptyFile(){ 66 function newEmptyFile() 67 { 60 68 var name = prompt(get_lang('Enter with the name of new file/directory'), ''); 61 69 var input_text = document.getElementById('newfile_or_dir'); … … 74 82 } 75 83 } 76 function newUpload(data){ 84 85 function newUpload(data) 86 { 77 87 if (data == null) 78 88 { … … 86 96 } 87 97 } 88 function newAdvancedUpload(){ 98 99 function newAdvancedUpload() 100 { 89 101 for (i=0; i < navigator.plugins.length; i++) 90 if (navigator.plugins[i].name.match('Java')){ 102 { 103 if (navigator.plugins[i].name.match('Java')) 104 { 91 105 close_window(); 92 106 draw_window("<iframe width=\"515\" height=\"320\" src='/filemanager/inc/uploadApp.php?id="+parseInt(Math.random()*Math.pow(10,15))+"'></iframe>",530,345); 93 107 return; 94 108 } 109 } 110 95 111 alert(get_lang("You do not have Java installed, plugin not loaded")); 96 112 } … … 205 221 } 206 222 207 208 function EditColumns(param){ 209 if (param == 'close') 210 { 211 var menu = document.getElementById('menu_col_pref'); 212 menu.parentNode.removeChild(menu); 213 return; 214 } 215 if(param == 'save') 223 function EditColumns( args ) 224 { 225 if( args == 'close' ) 226 { 227 _winBuild("window_tools_view","remove"); 228 } 229 else if( args == 'save') 216 230 { 217 231 var checkBoxes = document.getElementsByName('prefView'); 218 var url="";219 for ( var i=0; i < checkBoxes.length; i++)220 { 221 if (checkBoxes[i].checked)232 233 for ( var i = 0 ; i < checkBoxes.length; i++) 234 { 235 if( checkBoxes[i].checked === true ) 222 236 preferences[checkBoxes[i].value] = '1'; 223 237 else 224 238 preferences[checkBoxes[i].value] = '0'; 225 239 } 240 226 241 cExecute_('./index.php?menuaction=filemanager.user.save_preferences&preferences='+base64_encode(serialize(preferences)),function () { toolbar.control('reload'); EditColumns('close'); }); 227 return; 228 } 229 var checkList = (preferences['viewList'] == '1' ? 'checked="checked"': ''); 230 var checkIcons = (preferences['viewIcons'] == '1' ? 'checked="checked"': ''); 231 var typeHTML = '<input name="prefView" value="viewList" '+checkList+' type="radio">'+get_lang('view as list')+'<input name="prefView" '+checkIcons+' value="viewIcons" type="radio">'+get_lang('view as icons')+'<br>'; 232 var check = function(type) { if (preferences[type] =='1') return 'checked'; else return '';}; 233 var inputHTML = '<input name="prefView" type="checkbox" value="'; 234 form = typeHTML+inputHTML+'mime_type" '+check('mime_type')+'>'+get_lang('type')+'<br>'+ 235 inputHTML+'size" '+check('size')+'>'+get_lang('size')+'<br>'+ 236 inputHTML+'created" '+check('created')+'>'+get_lang('created')+'<br>'+ 237 inputHTML+'modified" '+check('modified')+'>'+get_lang('modified')+'<br>'+ 238 inputHTML+'owner" '+check('owner')+'>'+get_lang('owner')+'<br>'+ 239 inputHTML+'createdby_id" '+check('createdby_id')+'>'+get_lang('created by')+'<br>'+ 240 inputHTML+'modifiedby_id" '+check('modifiedby_id')+'>'+get_lang('modified by')+'<br>'+ 241 // inputHTML+'application" '+check('application')+'>'+get_lang('application')+'<br>'+ 242 inputHTML+'comment" '+check('comment')+'>'+get_lang('comment')+'<br>'+ 243 inputHTML+'version" '+check('version')+'>'+get_lang('version')+'<br>'+ 244 '<input value="'+get_lang('save')+'" onclick="EditColumns(\'save\')" type="button"> '+ 245 '<input value="'+get_lang('cancel')+'" onclick="EditColumns(\'close\')" type="button">'; 246 247 menu = document.createElement('DIV'); 248 menu.id = "menu_col_pref"; 249 menu.style.left = "100px"; 250 menu.style.top = "200px"; 251 menu.className = 'menubox'; 252 menu.style.zIndex='1'; 253 menu.innerHTML = form; 254 document.getElementById('divAppboxHeader').appendChild(menu); 242 } 243 else 244 { 245 if( Xtools == null ) 246 Xtools = new xtools( path_filemanager + "tp/expressowindow/" ); 247 248 var pTools = 249 { 250 'checkList' : preferences['viewList'], 251 'checkIcons': preferences['viewIcons'], 252 'check_created' : preferences['created'], 253 'check_createdby_id' : preferences['createdby_id'], 254 'check_comment' : preferences['comment'], 255 'check_mime_type' : preferences['mime_type'], 256 'check_modified' : preferences['modified'], 257 'check_modifiedby_id' : preferences['modifiedby_id'], 258 'check_owner' : preferences['owner'], 259 'check_size' : preferences['size'], 260 'check_version' : preferences['version'], 261 'lang_cancel' : get_lang('cancel'), 262 'lang_created_by' : get_lang('created by'), 263 'lang_created' : get_lang('created'), 264 'lang_comment' : get_lang('comment'), 265 'lang_modified_by' : get_lang('modified by'), 266 'lang_modified' : get_lang('modified'), 267 'lang_owner' : get_lang('owner'), 268 'lang_save' : get_lang('save'), 269 'lang_size' : get_lang('size'), 270 'lang_type' : get_lang('type'), 271 'lang_version' : get_lang('version'), 272 'lang_view_as_list' : get_lang('view as list'), 273 'lang_view_as_icons' : get_lang('view as icons'), 274 'onclickCancel' : "EditColumns(\'close\')", 275 'onclickSave' : "EditColumns(\'save\')" 276 } 277 278 var winTools = 279 { 280 id_window : "window_tools_view", 281 width : 250, 282 height : 290, 283 top : 100, 284 left : 400, 285 draggable : true, 286 visible : "display", 287 resizable : true, 288 zindex : zIndex++, 289 title : "Expresso FileManager - " + get_lang('View'), 290 closeAction : "remove", 291 content : Xtools.parse(Xtools.xml("view_config"), "view.xsl", pTools) 292 }; 293 294 _winBuild( winTools ); 295 } 255 296 } 256 297 -
branches/2.2/filemanager/js/draw_api.js
r3439 r3569 1 1 2 var offset; 3 var showHidden = null; 4 var Xtools = null; 5 var zIndex = 1000; 2 6 3 7 function getPointer(e) { … … 34 38 } 35 39 36 var zIndex=0; 37 function draw_window(htmlData, sizeW, sizeH){38 if ( sizeW == undefined)40 function draw_window(htmlData, sizeW, sizeH) 41 { 42 if ( sizeW == undefined ) 39 43 var sizeW = 420; 40 if (sizeH == undefined) 44 45 if ( sizeH == undefined ) 41 46 var sizeH = 200; 42 var _janela = { 47 48 var _janela = 49 { 43 50 id_window : "dwindow"+zIndex, 44 51 width : sizeW, … … 51 58 zindex : ++zIndex, 52 59 title : get_lang("filemanager"), 53 closeAction : "hidden",60 closeAction : "hidden", 54 61 content : htmlData 55 62 }; 56 63 57 64 _winBuild( _janela ); 58 59 /* var menu = document.getElementById('dwindow'); 60 headerWin = '<div class="message_header" style="width: 100%; heigth: 22px;"'+ 61 ' onselectstart="return false">'+ 62 '<img align="right" alt="'+get_lang('close')+'" title="'+get_lang('close')+'" '+ 63 'onclick="close_window()" src="'+templatePath+'/images/close.png">'+ 64 get_lang('filemanager')+'</div>'; 65 if (!menu){ 66 menu = document.createElement('DIV'); 67 menu.id = "dwindow"; 68 menu.style.left = 200; 69 menu.style.width = "400px"; 70 menu.style.top = DocY; 71 menu.className = 'menubox'; 72 menu.style.zIndex='1'; 73 menu.innerHTML = headerWin+htmlData; 74 document.getElementById('divAppbox').appendChild(menu); 75 } 76 else{ 77 menu.innerHTML = headerWin+htmlData; 78 menu.style.visibility = 'visible'; 79 }*/ 80 81 } 82 83 function draw_menu(id,elements){ 84 var menu = document.getElementById('menu_newFile'+id); 85 if (menu == null){ 86 menu = document.createElement('DIV'); 87 menu.id = "menu_newFile"+id; 88 menu.style.left = DocX; 89 menu.style.top = DocY; 90 for(j in elements) 91 { 92 var link = document.createElement( 'A' ); 93 if (typeof(elements[j]['img']) != 'undefined'){ 94 var img = document.createElement( 'IMG' ); 95 img.src = elements[j]['img']; 96 link.appendChild(img); 97 } 98 link.href = elements[j]['url']; 99 link.appendChild( document.createTextNode( elements[j]['text'] ) ); 100 menu.appendChild(link); 101 menu.appendChild(document.createElement( 'BR' )); 102 } 103 104 menu.onmouseout = function () { menuTimeout = setTimeout("document.getElementById('menu_newFile"+id+"').style.visibility = 'hidden'",50);} 105 menu.onmouseover = function () { clearTimeout(menuTimeout); }; 106 menu.className = 'menubox'; 107 menu.style.zIndex='1'; 108 document.getElementById('divAppboxHeader').appendChild(menu); 109 } 110 menu.style.visibility = 'visible'; 65 66 } 67 68 function draw_menu() 69 { 70 var _options = arguments[0]; 71 var _parent = arguments[1]; 72 var dt = new Date(); 73 74 if( showHidden == null ) 75 showHidden = new ShowHidden( 200 ); 76 77 var _itens = ""; 78 79 for( var i in _options ) 80 { 81 if( _options[i].constructor == Function ) 82 continue; 83 84 _itens += '<img src="' + _options[i][2] + '" '+ _options[i][3] +'/>'; 85 _itens += '<a href='+_options[i][1]+' style="cursor:pointer; margin:3px;">' + _options[i][0] + '</a><br/>' 86 } 87 88 var _optionsItens = document.createElement("div"); 89 _optionsItens.id = "fastMenuFileManager" + dt.getTime(); 90 _optionsItens.style.top = _parent.style.top + "px"; 91 _optionsItens.style.left = ( _parent.style.left + 40 ) + "px"; 92 _optionsItens.className = "x-menu"; 93 _optionsItens.style.zIndex = zIndex++; 94 _optionsItens.innerHTML = _itens; 95 _optionsItens.onclick = function(){ showHidden.hiddenObject(false); }; 96 _optionsItens.onmouseout = function(){ showHidden.hiddenObject(false); }; 97 _optionsItens.onmouseover = function(){ showHidden.hiddenObject(true); }; 98 99 showHidden.action('onmouseover', 'onmouseout', _optionsItens); 100 101 _parent.parentNode.appendChild( _optionsItens ); 102 111 103 } 112 104 … … 472 464 return filesUrl; 473 465 } 474 toolbar.prototype.control = function ( arg)466 toolbar.prototype.control = function () 475 467 { 476 //Used to get button position 477 var button = document.getElementsByName(arg); 478 button = button[0]; 479 switch (arg) { 468 var arg = arguments[0]; 469 var _parent = ( arguments[1] ) ? arguments[1] : null ; 470 471 switch ( arg ) 472 { 480 473 case 'new': 481 elements = new Array(); 482 elements[0] = { 'text': get_lang('empty file'), 483 'url': 'javascript:newEmptyFile()'}; 484 elements[1] = new Array(); 485 elements[1]['text'] = get_lang('File from model'); 474 486 475 address = document.location.toString(); 487 476 address = address.split("?"); 488 elements[1]['url'] = address[0]+"?menuaction=filemanager.uifilemanager.fileModels"; 489 elements[2] = { 'text' : get_lang('Upload'), 490 'url': 'javascript:newUpload()'}; 491 draw_menu(arg,elements); 492 break; 477 478 var itens = [ 479 [ get_lang('empty file'),'javascript:newEmptyFile()',templatePath+'images/group_close.gif', '' ], 480 [ get_lang('File from model'), address[0]+"?menuaction=filemanager.uifilemanager.fileModels", templatePath+'images/group_close.gif', '' ], 481 [ get_lang('Upload'), 'javascript:newUpload()', templatePath+'images/group_close.gif', '' ] 482 ]; 483 484 draw_menu( itens, _parent ); 485 486 break; 487 493 488 case 'rename': 494 489 var one_checked = false; … … 564 559 address = address.split("&"); 565 560 code += "<a href=\"javascript:"+escape(arg)+"('"+folders[i]+"','"+filesUrl+"'); close_window();\">"; 566 code +=folders[i]+"</a><br>";561 code += folders[i]+"</a><br>"; 567 562 568 563 } 569 564 DocY -= (folders.length*30); 570 565 draw_window(code); 571 // draw_menu(arg,elements); 572 break; 566 567 break; 568 573 569 case 'reload': 570 574 571 last_folder = last_folder ? last_folder : currentPath; 575 572 current_folder = current_folder ? current_folder : currentPath; 576 573 cExecute_('./index.php?menuaction=filemanager.uifilemanager.dir_ls&path='+base64_encode(currentPath)+'&criteria='+criteria+'&otype='+order_type+'&limit='+preferences.files_per_page+'&offset='+offset,folderList.drawFiles); 577 574 return; 575 578 576 case 'tools': 579 elements = new Array(); 580 elements[0] = { 'text' : get_lang('Preferences'), 581 'url' : 'preferences/preferences.php?appname=filemanager', 582 'img' : templatePath+'images/preferences.png'}; 583 elements[1] = { 'text' : get_lang('Search'), 584 'url' : 'javascript:document.getElementById("menu_newFiletools").style.visibility="hidden";\ 585 document.getElementById("em_message_search").focus();', 586 'img' : templatePath+'images/search.gif'}; 587 elements[2] = { 'text' : get_lang('Edit Folders'), 588 'url' : 'javascript:editFolders()', 589 'img' : templatePath+'images/button_createdir.png'}; 590 elements[3] = { 'text' : get_lang('Share Folders'), 591 'url' : "./index.php?menuaction=preferences.uiaclprefs.index&acl_app=filemanager", 592 'img' : templatePath+'images/mime16_directory.png'}; 593 elements[4] = { 'text' : get_lang('View'), 594 'url' : "javascript:EditColumns()", 595 'img' : templatePath+'images/editpaste.png'}; 596 elements[5] = {'text' : get_lang('Archive'), 597 'url' : "javascript:toolbar.control('archive')", 598 'img' : templatePath+'images/button_zip.png'}; 599 draw_menu(arg,elements); 577 578 var itens = [ 579 [ get_lang('Preferences'), 'preferences/preferences.php?appname=filemanager', templatePath+'images/preferences.png', 'width="16px" height="16px"' ], 580 [ get_lang('Edit Folders'), 'javascript:editFolders()', templatePath+'images/button_createdir.png', 'width="16px" height="16px"'], 581 [ get_lang('Share Folders'), './index.php?menuaction=preferences.uiaclprefs.index&acl_app=filemanager', templatePath+'images/mime16_directory.png', 'width="16px" height="16px"'], 582 [ get_lang('View'), 'javascript:EditColumns()', templatePath+'images/editpaste.png', 'width="16px" height="16px"' ], 583 [ get_lang('Archive'), 'javascript:toolbar.control("archive")', templatePath+'images/button_zip.png', 'width="16px" height="16px"' ] 584 ]; 585 586 draw_menu( itens, _parent ); 587 600 588 break; 601 589 default: … … 603 591 } 604 592 } 593 605 594 var toolbar = new toolbar(); 606 595 607 function unarchive(filename){ 596 function unarchive(filename) 597 { 608 598 password = crypt.encode(prompt(get_lang('Please, type archive password or leave it empty if it is not encrypted'))); 609 599 if (password == null) … … 611 601 cExecute_('./index.php?menuaction=filemanager.vfs_functions.unarchive&pswd='+base64_encode(password)+'&path='+base64_encode(currentPath)+'&file='+base64_encode(filename),handler.archive); 612 602 } 613 function move_to(to,filesUrl){ 603 604 function move_to(to,filesUrl) 605 { 614 606 cExecute_('./index.php?menuaction=filemanager.vfs_functions.moveto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.moveto); 615 607 } 616 function copy_to(to,filesUrl){ 608 609 function copy_to(to,filesUrl) 610 { 617 611 cExecute_('./index.php?menuaction=filemanager.vfs_functions.copyto&from='+base64_encode(currentPath)+'&to='+base64_encode(to)+filesUrl,handler.copyto); 618 612 } 619 613 620 function draw_card(type,name){ 614 function draw_card(type,name) 615 { 621 616 clearTimeout(menuTimeout); 622 617 switch(type){ -
branches/2.2/filemanager/tp/expressowindow/css/window_azul.css
r3436 r3569 4 4 border : 1px solid #8ea4c1; 5 5 color : #15428b !important; 6 display : none;7 margin : 20px 5px 0px -15px;8 6 position : absolute; 9 7 } -
branches/2.2/filemanager/tp/expressowindow/css/window_cataratas.css
r3436 r3569 4 4 border : 1px solid #7bc64e; 5 5 color : #ffffed !important; 6 display : none;7 margin : 20px 5px 0px -15px;8 6 position : absolute; 9 7 } -
branches/2.2/filemanager/tp/expressowindow/css/window_celepar.css
r3436 r3569 6 6 border : 1px solid #918b8b; 7 7 color: : #585656 !important; 8 display : none;9 margin : 20px 5px 0px -15px;10 8 position : absolute; 11 9 } -
branches/2.2/filemanager/tp/expressowindow/css/window_comics.css
r3436 r3569 6 6 border : 1px solid #000; 7 7 color : #000 !important; 8 display : none;9 margin : 20px 5px 0px -15px;10 8 position : absolute; 11 9 } -
branches/2.2/filemanager/tp/expressowindow/css/window_default.css
r3436 r3569 6 6 border : 1px solid #918b8b; 7 7 color: : #585656 !important; 8 display : none;9 margin : 20px 5px 0px -15px;10 8 position : absolute; 11 9 } -
branches/2.2/filemanager/tp/expressowindow/css/window_escritorio.css
r3436 r3569 6 6 border : 1px solid #1e4098; 7 7 color : #fff !important; 8 display : none;9 margin : 20px 5px 0px -15px;10 8 position : absolute; 11 9 } -
branches/2.2/filemanager/tp/expressowindow/css/window_metropole.css
r3436 r3569 6 6 border : 1px solid #000; 7 7 color : #fffcdf !important; 8 display : none;9 margin : 20px 5px 0px -15px;10 8 position : absolute; 11 9 } -
branches/2.2/filemanager/tp/expressowindow/css/window_rochas.css
r3436 r3569 6 6 border : 1px solid #bd8d5d; 7 7 color : #000 !important; 8 display : none;9 margin : 20px 5px 0px -15px;10 8 position : absolute; 11 9 } -
branches/2.2/filemanager/tp/expressowindow/js/dragdrop.js
r3436 r3569 6 6 var _parent = null; 7 7 8 function _configEvent( pObj, pEvent, pHandler)9 { 10 if ( typeof pObj == 'object' )8 function _configEvent( pObj, pEvent, pHandler ) 9 { 10 if ( pObj && typeof pObj == 'object' ) 11 11 { 12 12 if ( pEvent.substring(0, 2) == 'on' ) … … 22 22 else if ( arguments.length == 4 ) 23 23 { 24 if ( pObj.removeEventListener && pObj.removeEventListener != 'undefined') 25 pObj.removeEventListener(pEvent, pHandler, false); 24 if ( pObj.removeEventListener ) 25 { 26 pObj.removeEventListener( pEvent, pHandler, false ); 27 } 26 28 else if ( pObj.detachEvent ) 27 pObj.detachEvent('on' + pEvent, pHandler); 29 { 30 pObj.detachEvent( 'on' + pEvent, pHandler ); 31 } 28 32 } 29 33 } … … 148 152 if ( _element ) 149 153 { 150 _mouseUpShadow();151 152 154 _configEvent(_element, 'onmousemove', _mouseMove, 'remove'); 153 155 _configEvent(top.document, 'onmousemove', _mouseMove, 'remove'); … … 157 159 158 160 _element.mouseOffset = null; 159 _ element = null;161 _mouseUpShadow(); 160 162 } 161 163 } -
branches/2.2/filemanager/tp/expressowindow/js/makeW.js
r3568 r3569 4 4 var dragDrop = null; 5 5 var path = path_filemanager + "tp/expressowindow/"; 6 7 var _dialogs = [ ]; 6 8 7 9 function build(pObj) … … 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 ); 43 44 _dialogs[ pObj.id_window ] = getElement(pObj.id_window + '__content').firstChild; 35 45 36 46 if( pObj.draggable ) … … 42 52 else 43 53 { 44 load(pObj.id_window, "display"); 54 if ( pObj.barejid && loadscript.windowPOPUP( pObj.barejid ) ) 55 return false; 56 57 load(pObj.id_window, "display"); 45 58 } 46 59 } … … 59 72 if ( pVisible == "display" ) 60 73 { 61 _window.style.left = _window.getAttribute("leftOld"); 74 if( _window.style.left == "-1500px" ) 75 _window.style.left = _window.getAttribute("leftOld"); 62 76 } 63 77 … … 79 93 if( arguments.length > 0 ) 80 94 { 95 var pId = null; 81 96 if( arguments.length == 1 ) 82 97 { 83 JSLoader.load([path + "css/" + theme_filemanager]);84 85 98 var obj = arguments[0]; 86 87 setTimeout(function(){ build(obj);}, 200);99 pId = obj.id_window 100 build(obj); 88 101 } 89 102 90 103 if( arguments.length == 2 ) 91 104 { 92 load( arguments[0], arguments[1]);105 load( ( pId = arguments[0] ), arguments[1]); 93 106 } 94 107 } 108 109 return ( new function( ) 110 { 111 this.content = function( ) 112 { 113 if ( arguments.length ) 114 getElement( pId + '__content').appendChild( _dialogs[ pId ] ); 115 116 return _dialogs[ obj.id_window ]; 117 }; 118 } ); 95 119 } 96 120 … … 104 128 { 105 129 if( arguments.length == 1 ) 106 _win = newbWindow( arguments[0] );130 return bWindow( arguments[0] ); 107 131 108 132 if( arguments.length == 2 ) 109 _win = newbWindow( arguments[0], arguments[1]);133 return bWindow( arguments[0], arguments[1]); 110 134 } 135 return false; 111 136 } -
branches/2.2/filemanager/tp/expressowindow/js/xtools.js
r3436 r3569 90 90 var params = arguments[2]; 91 91 for (var i in params ) 92 xslProc.setParameter(null, i, params[i]); 92 if ( params[ i ] && params[ i ].constructor != Function ) 93 xslProc.setParameter(null, String( i ), String( params[i] ) ); 93 94 } 94 95 … … 112 113 var params = arguments[2]; 113 114 for (var i in params ) 114 xslProc.addParameter(i, params[i], ''); 115 if ( params[ i ] && params[ i ].constructor != Function ) 116 { 117 xslProc.addParameter( String( i ), String( params[i] ), ''); 118 } 115 119 } 116 120
Note: See TracChangeset
for help on using the changeset viewer.