extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 01:48:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed javascript error stalling closing of filemanager tab or changing to shared files view

Browse Source
This commit is contained in:
Ralf Becker 2015-01-15 16:01:41 +00:00
parent 9840334b5c
commit 6db17e8bde
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
filemanager/js/app.js
View File

@ -76,7 +76,7 @@ app.classes.filemanager = AppJS.extend(
{ {
// Bind to removal to remove from list // Bind to removal to remove from list
$j(et2.DOMContainer).on('clear', function(e) { $j(et2.DOMContainer).on('clear', function(e) {
delete app.filemanager.path_widget[e.target.id]; if (app.filemanager && app.filemanager.path_widget) delete app.filemanager.path_widget[e.target.id];
}); });
} }
@ -124,7 +124,7 @@ app.classes.filemanager = AppJS.extend(
} }
} }
var result = this._super.call(this,state); var result = this._super.call(this,state);
// This has to happen after the parent, changing to tile recreates // This has to happen after the parent, changing to tile recreates
// nm controller // nm controller
if(typeof state == "object" && state.state && state.state.view) if(typeof state == "object" && state.state && state.state.view)
@ -262,7 +262,7 @@ app.classes.filemanager = AppJS.extend(
'preset[filemode]': _action.id.substr(5) 'preset[filemode]': _action.id.substr(5)
}); });
}, },
/** /**
* Trigger Upload after each file is uploaded * Trigger Upload after each file is uploaded
* @param {type} _event * @param {type} _event
@ -271,7 +271,7 @@ app.classes.filemanager = AppJS.extend(
{ {
this.upload(_event,1); this.upload(_event,1);
}, },
/** /**
* Send names of uploaded files (again) to server, to process them: either copy to vfs or ask overwrite/rename * Send names of uploaded files (again) to server, to process them: either copy to vfs or ask overwrite/rename
* *
@ -682,7 +682,7 @@ app.classes.filemanager = AppJS.extend(
/** /**
* Toggle view between tiles and rows * Toggle view between tiles and rows
* *
* @param {string|Event} [view] - Specify what to change the view to. Either 'tile' or 'row'. * @param {string|Event} [view] - Specify what to change the view to. Either 'tile' or 'row'.
* Or, if this is used as a callback view is actually the event, and we need to find the view. * Or, if this is used as a callback view is actually the event, and we need to find the view.
* @param {et2_widget} [button_widget] - The widget that's calling * @param {et2_widget} [button_widget] - The widget that's calling