Module: deluge Branch: master Commit: 692ec5bb1b4c17a8f4019a5d5fcc31e66f6caa14
Author: Damien Churchill <[email protected]> Date: Wed Mar 31 11:56:21 2010 +0100 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 + .../js/deluge-all/add/{File.js => FileWindow.js} | 2 +- .../web/js/deluge-all/add/{Url.js => UrlWindow.js} | 27 +++++++++----------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/deluge/ui/web/js/deluge-all/add/AddWindow.js b/deluge/ui/web/js/deluge-all/add/AddWindow.js index 5f8edb6..334953f 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 dfae5e3..632e7a3 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 6851930..717cac9 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); -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
