codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug in adding torrent from file

This commit is contained in:
Damien Churchill 2008-11-13 22:14:14 +00:00
parent 06231c1799
commit af85f56b98
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deluge/ui/webui/templates/ajax/static/js/deluge-add.js
View File

@ -112,8 +112,14 @@ Deluge.Widgets.AddTorrent.File = new Class({
onCancel: this.onCancel.bindWithEvent(this), onCancel: this.onCancel.bindWithEvent(this),
onSubmit: this.onSubmit.bindWithEvent(this), onSubmit: this.onSubmit.bindWithEvent(this),
onComplete: this.onComplete.bindWithEvent(this), onComplete: this.onComplete.bindWithEvent(this),
onBeforeShow: this.onBeforeShow.bindWithEvent(this),
onGetInfoSuccess: this.onGetInfoSuccess.bindWithEvent(this) onGetInfoSuccess: this.onGetInfoSuccess.bindWithEvent(this)
}; };
this.addEvent('beforeShow', this.bound.onBeforeShow);
},
onBeforeShow: function(e) {
if (this.iframe) this.iframe.destroy();
this.iframe = new Element('iframe', { this.iframe = new Element('iframe', {
src: '/template/render/html/window_add_torrent_file.html', src: '/template/render/html/window_add_torrent_file.html',
height: 65, height: 65,
@ -123,19 +129,19 @@ Deluge.Widgets.AddTorrent.File = new Class({
overflow: 'hidden' overflow: 'hidden'
} }
}); });
this.iframe.addEvent('load', this.bound.onLoad);
this.content.grab(this.iframe); this.content.grab(this.iframe);
this.iframe.addEvent('load', this.bound.onLoad);
}, },
onLoad: function(e) { onLoad: function(e) {
this.iframe.set('opacity', 1);
var body = $(this.iframe.contentDocument.body); var body = $(this.iframe.contentDocument.body);
var form = body.getElement('form'); var form = body.getElement('form');
this.cancelButton = form.getElement('button.cancel'); var cancelButton = form.getElement('button.cancel');
this.cancelButton.addEvent('click', this.bound.onCancel); cancelButton.addEvent('click', this.bound.onCancel);
var fileInputs = form.getElement('div.fileInputs'); var fileInputs = form.getElement('div.fileInputs');
var fileInput = fileInputs.getElement('input'); var fileInput = fileInputs.getElement('input');
fileInput.set('opacity', 0.000001);
var fakeFile = fileInputs.getElement('div').getElement('input'); var fakeFile = fileInputs.getElement('div').getElement('input');
fileInput.addEvent('change', function(e) { fileInput.addEvent('change', function(e) {
@ -157,6 +163,7 @@ Deluge.Widgets.AddTorrent.File = new Class({
onComplete: function(e) { onComplete: function(e) {
filename = $(this.iframe.contentDocument.body).get('text'); filename = $(this.iframe.contentDocument.body).get('text');
this.hide();
Deluge.Client.get_torrent_info(filename, { Deluge.Client.get_torrent_info(filename, {
onSuccess: this.bound.onGetInfoSuccess onSuccess: this.bound.onGetInfoSuccess
}); });
@ -164,10 +171,6 @@ Deluge.Widgets.AddTorrent.File = new Class({
onGetInfoSuccess: function(info) { onGetInfoSuccess: function(info) {
if (info) this.fireEvent('torrentAdded', info); if (info) this.fireEvent('torrentAdded', info);
this.hide();
this.iframe.removeEvent('load', this.bound.onComplete);
this.iframe.addEvent('load', this.bound.onLoad);
this.iframe.src = '/template/render/html/window_add_torrent_file.html';
} }
}); });

3
deluge/ui/webui/templates/ajax/static/themes/classic/iframe.css
View File

@ -37,9 +37,6 @@ form input.file {
top: 0px; top: 0px;
left: 0px; left: 0px;
text-align: left; text-align: left;
-moz-opacity: 0;
opacity: 0;
filter: alpha(opacity: 0);
z-index: 2; z-index: 2;
} }

2
deluge/ui/webui/templates/ajax/static/themes/classic/style.css
View File

@ -343,7 +343,7 @@ label.fluid {
} }
#addTorrent #addButtons { #addTorrent #addButtons {
width: 240px; width: 250px;
margin: 0 auto; margin: 0 auto;
} }