[WebUI] Compress javascript files

3 files changed, 21 insertions, 12 deletions

diff --git a/deluge/ui/web/gettext.js b/deluge/ui/web/gettext.js
index eed36cb84..2ec8b912a 100644
--- a/deluge/ui/web/gettext.js
+++ b/deluge/ui/web/gettext.js
@@ -80,7 +80,7 @@ GetText.add('80 KiB/s', '${escape(_("80 KiB/s"))}')
 // QueuePage.js:69
 GetText.add('Active Torrents', '${escape(_("Active Torrents"))}')
 
-// EditTrackersWindow.js:112, ConnectionManager.js:110, AddConnectionWindow.js:56, Toolbar.js:58, AddTrackerWindow.js:57, UrlWindow.js:50, FileWindow.js:53, AddWindow.js:52
+// EditTrackersWindow.js:112, ConnectionManager.js:110, AddConnectionWindow.js:56, Toolbar.js:58, AddTrackerWindow.js:66, UrlWindow.js:50, FileWindow.js:53, AddWindow.js:52
 GetText.add('Add', '${escape(_("Add"))}')
 
 // AddConnectionWindow.js:40
@@ -92,7 +92,7 @@ GetText.add('Add In Paused State', '${escape(_("Add In Paused State"))}')
 // AddWindow.js:37
 GetText.add('Add Torrents', '${escape(_("Add Torrents"))}')
 
-// AddTrackerWindow.js:40
+// AddTrackerWindow.js:49
 GetText.add('Add Tracker', '${escape(_("Add Tracker"))}')
 
 // FileWindow.js:40
@@ -155,7 +155,7 @@ GetText.add('Cache Expiry (seconds)', '${escape(_("Cache Expiry (seconds)"))}')
 // CachePage.js:63
 GetText.add('Cache Size (16 KiB Blocks)', '${escape(_("Cache Size (16 KiB Blocks)"))}')
 
-// EditTrackersWindow.js:56, OtherLimitWindow.js:72, RemoveWindow.js:55, MoveStorage.js:55, EditTrackerWindow.js:56, AddTrackerWindow.js:56, AddWindow.js:51
+// EditTrackersWindow.js:56, OtherLimitWindow.js:72, RemoveWindow.js:55, MoveStorage.js:55, EditTrackerWindow.js:56, AddTrackerWindow.js:65, AddWindow.js:51
 GetText.add('Cancel', '${escape(_("Cancel"))}')
 
 // PreferencesWindow.js:85
@@ -761,7 +761,7 @@ GetText.add('Tracker', '${escape(_("Tracker"))}')
 // Sidebar.js:35
 GetText.add('Tracker Host', '${escape(_("Tracker Host"))}')
 
-// AddTrackerWindow.js:66
+// AddTrackerWindow.js:75
 GetText.add('Trackers', '${escape(_("Trackers"))}')
 
 // ProxyField.js:48
diff --git a/deluge/ui/web/js/deluge-all-debug.js b/deluge/ui/web/js/deluge-all-debug.js
index ce0375ffc..0b6914284 100644
--- a/deluge/ui/web/js/deluge-all-debug.js
+++ b/deluge/ui/web/js/deluge-all-debug.js
@@ -5283,7 +5283,7 @@ Deluge.AddConnectionWindow = Ext.extend(Ext.Window, {
 });
 /*!
  * Deluge.AddTrackerWindow.js
- * 
+ *
  * Copyright (c) Damien Churchill 2009-2010 <damoxc@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -5314,12 +5314,21 @@ Deluge.AddConnectionWindow = Ext.extend(Ext.Window, {
  */
 Ext.ns('Deluge');
 
+// Custom VType validator for tracker urls
+var trackerUrlTest = /(((^https?)|(^udp)):\/\/([\-\w]+\.)+\w{2,3}(\/[%\-\w]+(\.\w{2,})?)*(([\w\-\.\?\\\/+@&#;`~=%!]*)(\.\w{2,})?)*\/?)/i;
+Ext.apply(Ext.form.VTypes, {
+	 trackerUrl: function(val, field) {
+		 return trackerUrlTest.test(val);
+	 },
+	 trackerUrlText: 'Not a valid tracker url'
+});
+
 /**
  * @class Deluge.AddTrackerWindow
  * @extends Ext.Window
  */
 Deluge.AddTrackerWindow = Ext.extend(Ext.Window, {
-	
+
 	title: _('Add Tracker'),
 	layout: 'fit',
 	width: 375,
@@ -5335,11 +5344,11 @@ Deluge.AddTrackerWindow = Ext.extend(Ext.Window, {
 
 	initComponent: function() {
 		Deluge.AddTrackerWindow.superclass.initComponent.call(this);
-	
+
 		this.addButton(_('Cancel'), this.onCancelClick, this);
 		this.addButton(_('Add'), this.onAddClick, this);
 		this.addEvents('add');
-	
+
 		this.form = this.add({
 			xtype: 'form',
 			defaultType: 'textarea',
@@ -5356,10 +5365,10 @@ Deluge.AddTrackerWindow = Ext.extend(Ext.Window, {
 	onAddClick: function() {
 		var trackers = this.form.getForm().findField('trackers').getValue();
 		trackers = trackers.split('\n');
-	
+
 		var cleaned = [];
 		Ext.each(trackers, function(tracker) {
-			if (Ext.form.VTypes.url(tracker)) {
+			if (Ext.form.VTypes.trackerUrl(tracker)) {
 				cleaned.push(tracker);
 			}
 		}, this);
diff --git a/deluge/ui/web/js/deluge-all.js b/deluge/ui/web/js/deluge-all.js
index 3c4e13216..d7eb2d9ac 100644
--- a/deluge/ui/web/js/deluge-all.js
+++ b/deluge/ui/web/js/deluge-all.js
@@ -1056,7 +1056,7 @@ Ext.namespace("Deluge");Deluge.OptionsManager=Ext.extend(Ext.util.Observable,{co
 Ext.ns("Deluge");Deluge.AddConnectionWindow=Ext.extend(Ext.Window,{title:_("Add Connection"),iconCls:"x-deluge-add-window-icon",layout:"fit",width:300,height:195,bodyStyle:"padding: 10px 5px;",closeAction:"hide",initComponent:function(){Deluge.AddConnectionWindow.superclass.initComponent.call(this);this.addEvents("hostadded");this.addButton(_("Close"),this.hide,this);this.addButton(_("Add"),this.onAddClick,this);this.on("hide",this.onHide,this);this.form=this.add({xtype:"form",defaultType:"textfield",baseCls:"x-plain",labelWidth:60,items:[{fieldLabel:_("Host"),name:"host",anchor:"75%",value:""},{xtype:"spinnerfield",fieldLabel:_("Port"),name:"port",strategy:{xtype:"number",decimalPrecision:0,minValue:-1,maxValue:65535},value:"58846",anchor:"40%"},{fieldLabel:_("Username"),name:"username",anchor:"75%",value:""},{fieldLabel:_("Password"),anchor:"75%",name:"password",inputType:"password",value:""}]})},onAddClick:function(){var a=this.form.getForm().getValues();deluge.client.web.add_host(a.host,a.port,a.username,a.password,{success:function(b){if(!b[0]){Ext.MessageBox.show({title:_("Error"),msg:"Unable to add host: "+b[1],buttons:Ext.MessageBox.OK,modal:false,icon:Ext.MessageBox.ERROR,iconCls:"x-deluge-icon-error"})}else{this.fireEvent("hostadded")}this.hide()},scope:this})},onHide:function(){this.form.getForm().reset()}});
 /*
  * Deluge.AddTrackerWindow.js
- * 
+ *
  * Copyright (c) Damien Churchill 2009-2010 <damoxc@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -1085,7 +1085,7 @@ Ext.ns("Deluge");Deluge.AddConnectionWindow=Ext.extend(Ext.Window,{title:_("Add
  * this exception statement from your version. If you delete this exception
  * statement from all source files in the program, then also delete it here.
  */
-Ext.ns("Deluge");Deluge.AddTrackerWindow=Ext.extend(Ext.Window,{title:_("Add Tracker"),layout:"fit",width:375,height:150,plain:true,closable:true,resizable:false,bodyStyle:"padding: 5px",buttonAlign:"right",closeAction:"hide",iconCls:"x-deluge-edit-trackers",initComponent:function(){Deluge.AddTrackerWindow.superclass.initComponent.call(this);this.addButton(_("Cancel"),this.onCancelClick,this);this.addButton(_("Add"),this.onAddClick,this);this.addEvents("add");this.form=this.add({xtype:"form",defaultType:"textarea",baseCls:"x-plain",labelWidth:55,items:[{fieldLabel:_("Trackers"),name:"trackers",anchor:"100%"}]})},onAddClick:function(){var b=this.form.getForm().findField("trackers").getValue();b=b.split("\n");var a=[];Ext.each(b,function(c){if(Ext.form.VTypes.url(c)){a.push(c)}},this);this.fireEvent("add",a);this.hide();this.form.getForm().findField("trackers").setValue("")},onCancelClick:function(){this.form.getForm().findField("trackers").setValue("");this.hide()}});
+Ext.ns("Deluge");var trackerUrlTest=/(((^https?)|(^udp)):\/\/([\-\w]+\.)+\w{2,3}(\/[%\-\w]+(\.\w{2,})?)*(([\w\-\.\?\\\/+@&#;`~=%!]*)(\.\w{2,})?)*\/?)/i;Ext.apply(Ext.form.VTypes,{trackerUrl:function(b,a){return trackerUrlTest.test(b)},trackerUrlText:"Not a valid tracker url"});Deluge.AddTrackerWindow=Ext.extend(Ext.Window,{title:_("Add Tracker"),layout:"fit",width:375,height:150,plain:true,closable:true,resizable:false,bodyStyle:"padding: 5px",buttonAlign:"right",closeAction:"hide",iconCls:"x-deluge-edit-trackers",initComponent:function(){Deluge.AddTrackerWindow.superclass.initComponent.call(this);this.addButton(_("Cancel"),this.onCancelClick,this);this.addButton(_("Add"),this.onAddClick,this);this.addEvents("add");this.form=this.add({xtype:"form",defaultType:"textarea",baseCls:"x-plain",labelWidth:55,items:[{fieldLabel:_("Trackers"),name:"trackers",anchor:"100%"}]})},onAddClick:function(){var b=this.form.getForm().findField("trackers").getValue();b=b.split("\n");var a=[];Ext.each(b,function(c){if(Ext.form.VTypes.trackerUrl(c)){a.push(c)}},this);this.fireEvent("add",a);this.hide();this.form.getForm().findField("trackers").setValue("")},onCancelClick:function(){this.form.getForm().findField("trackers").setValue("");this.hide()}});
 /*
  * Deluge.Client.js
  *