holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix file upload from file_selection dialog not working in IE and Safari

Browse Source
This commit is contained in:
Hadi Nategh 2015-03-17 17:27:00 +00:00
parent f078a2ae82
commit 26057f6848
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
etemplate/js/et2_widget_vfs.js
View File

@ -764,27 +764,31 @@ var et2_vfsSelect = et2_inputWidget.extend(
}; };
// Open the filemanager select in a popup // Open the filemanager select in a popup
var popup = this.egw().open_link( var popup = this.egw(window).open_link(
this.egw().link('/index.php', attrs), this.egw().link('/index.php', attrs),
'link_existing', 'link_existing',
'680x400' '680x400'
); );
if(popup) if(popup)
{ {
// Safari and IE lose reference to global variables after window close
// Try to get updated data before window is closed then later we trigger
// change event on widget
self.egw().window.setTimeout(function(){
jQuery(popup).bind('unload',function(){
// Set selected files to widget
self.value = this.selected_files;
// Update path to where the user wound up]
if (typeof this.etemplate2 !='undefined') self.options.path = this.etemplate2.getByApplication('filemanager')[0].widgetContainer.getArrayMgr("content").getEntry('path');
});
},1000);
// Update on close doesn't always (ever, in chrome) work, so poll // Update on close doesn't always (ever, in chrome) work, so poll
var poll = self.egw().window.setInterval( var poll = self.egw().window.setInterval(
function() { function() {
if(popup.closed) { if(popup.closed) {
self.egw().window.clearInterval(poll); self.egw().window.clearInterval(poll);
// Update path to where the user wound up
var path = popup.etemplate2.getByApplication('filemanager')[0].widgetContainer.getArrayMgr("content").getEntry('path') || '';
self.options.path = path;
// Get the selected files
var files = popup.selected_files || [];
self.value = files;
// Fire a change event so any handlers run // Fire a change event so any handlers run
$j(self.node).change(); $j(self.node).change();
} }