From 692ec5bb1b4c17a8f4019a5d5fcc31e66f6caa14 Mon Sep 17 00:00:00 2001
From: Damien Churchill <damoxc@gmail.com>
Date: Wed, 31 Mar 2010 11:56:21 +0100
Subject: [PATCH] clean up the Url window a little bit and rename Url.js to
 UrlWindow.js create the FileWindow on demand and change the filename to match
 the classname

---
 deluge/ui/web/js/deluge-all/add/AddWindow.js  |  1 +
 .../deluge-all/add/{File.js => FileWindow.js} |  2 +-
 .../deluge-all/add/{Url.js => UrlWindow.js}   | 27 +++++++++----------
 3 files changed, 14 insertions(+), 16 deletions(-)
 rename deluge/ui/web/js/deluge-all/add/{File.js => FileWindow.js} (99%)
 rename deluge/ui/web/js/deluge-all/add/{Url.js => UrlWindow.js} (88%)

diff --git a/deluge/ui/web/js/deluge-all/add/AddWindow.js b/deluge/ui/web/js/deluge-all/add/AddWindow.js
index 5f8edb6c6..334953f6e 100644
--- a/deluge/ui/web/js/deluge-all/add/AddWindow.js
+++ b/deluge/ui/web/js/deluge-all/add/AddWindow.js
@@ -155,6 +155,7 @@ Deluge.add.AddWindow = Ext.extend(Deluge.add.Window, {
 	},
 
 	onFile: function() {
+		if (!this.file) this.file = new Deluge.add.FileWindow();
 		this.file.show();
 	},
 
diff --git a/deluge/ui/web/js/deluge-all/add/File.js b/deluge/ui/web/js/deluge-all/add/FileWindow.js
similarity index 99%
rename from deluge/ui/web/js/deluge-all/add/File.js
rename to deluge/ui/web/js/deluge-all/add/FileWindow.js
index dfae5e317..632e7a306 100644
--- a/deluge/ui/web/js/deluge-all/add/File.js
+++ b/deluge/ui/web/js/deluge-all/add/FileWindow.js
@@ -46,7 +46,7 @@ Deluge.add.FileWindow = Ext.extend(Deluge.add.Window, {
 	buttonAlign: 'center',
 	closeAction: 'hide',
 	bodyStyle: 'padding: 10px 5px;',
-	iconCls: 'x-deluge-add-file'
+	iconCls: 'x-deluge-add-file',
 
 	initComponent: function() {
 		Deluge.add.FileWindow.superclass.initComponent.call(this);
diff --git a/deluge/ui/web/js/deluge-all/add/Url.js b/deluge/ui/web/js/deluge-all/add/UrlWindow.js
similarity index 88%
rename from deluge/ui/web/js/deluge-all/add/Url.js
rename to deluge/ui/web/js/deluge-all/add/UrlWindow.js
index 6851930b8..717cac98c 100644
--- a/deluge/ui/web/js/deluge-all/add/Url.js
+++ b/deluge/ui/web/js/deluge-all/add/UrlWindow.js
@@ -32,21 +32,18 @@
 
 Ext.namespace('Deluge.add');
 Deluge.add.UrlWindow = Ext.extend(Deluge.add.Window, {
-	constructor: function(config) {
-		config = Ext.apply({
-			layout: 'fit',
-			width: 350,
-			height: 155,
-			bodyStyle: 'padding: 10px 5px;',
-			buttonAlign: 'center',
-			closeAction: 'hide',
-			modal: true,
-			plain: true,
-			title: _('Add from Url'),
-			iconCls: 'x-deluge-add-url-window-icon'
-		}, config);
-		Deluge.add.UrlWindow.superclass.constructor.call(this, config);
-	},
+
+	title: _('Add from Url'),
+	modal: true,
+	plain: true,
+	layout: 'fit',
+	width: 350,
+	height: 155,
+
+	buttonAlign: 'center',
+	closeAction: 'hide',
+	bodyStyle: 'padding: 10px 5px;',
+	iconCls: 'x-deluge-add-url-window-icon',
 	
 	initComponent: function() {
 		Deluge.add.UrlWindow.superclass.initComponent.call(this);