diff options
Diffstat (limited to 'module/web')
| -rw-r--r-- | module/web/pyload_app.py | 4 | ||||
| -rw-r--r-- | module/web/templates/default/filemanager_ui.js | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py index 693d08d06..784127f72 100644 --- a/module/web/pyload_app.py +++ b/module/web/pyload_app.py @@ -397,9 +397,7 @@ def path(file="", path=""): for f in folders: try: f = f.decode(getfilesystemencoding()) - data = {} - data['name'] = f - data['fullpath'] = join(cwd, f) + data = {'name': f, 'fullpath': join(cwd, f)} data['sort'] = data['fullpath'].lower() data['modified'] = datetime.fromtimestamp(int(os.path.getmtime(join(cwd, f)))) data['ext'] = os.path.splitext(f)[1] diff --git a/module/web/templates/default/filemanager_ui.js b/module/web/templates/default/filemanager_ui.js index 0b801316c..ed64ab69d 100644 --- a/module/web/templates/default/filemanager_ui.js +++ b/module/web/templates/default/filemanager_ui.js @@ -104,7 +104,7 @@ var Item = new Class({ this.directories = []; this.files = []; this.actions = new Array(); - this.actions["delete"] = this.delete; + this.actions["delete"] = this.del; this.actions["rename"] = this.rename; this.actions["mkdir"] = this.mkdir; this.parseElement(); @@ -152,7 +152,7 @@ var Item = new Class({ //TODO sort the main ul again (to keep data ordered after renaming something) }, - delete: function(event) { + del: function(event) { $("confirm_form").removeEvents("submit"); $("confirm_form").addEvent("submit", this.deleteDirectory.bind(this)); |