Author: damoxc
Revision: 6170
Log:
update the copyright header year for all the js files
implement a new update method that will be compatible with the torrent status
deltas
add a new script containing a record for a Torrent
Diff:
Modified: trunk/deluge/ui/web/js/deluge-all/.build
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/.build 2010-02-04 11:17:26 UTC (rev
6169)
+++ trunk/deluge/ui/web/js/deluge-all/.build 2010-02-10 22:15:29 UTC (rev
6170)
@@ -38,5 +38,6 @@
add_file "Deluge.Sidebar.js"
add_file "Deluge.Statusbar.js"
add_file "Deluge.Toolbar.js"
+add_file "Deluge.Torrent.js"
add_file "Deluge.Torrents.js"
add_file "Deluge.UI.js"
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Add.File.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Add.File.js 2010-02-04
11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Add.File.js 2010-02-10
22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
Contains the Add Torrent by file window.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Add.Infohash.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Add.Infohash.js 2010-02-04
11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Add.Infohash.js 2010-02-10
22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
Contains the Add Torrent by infohash window.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Add.Url.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Add.Url.js 2010-02-04 11:17:26 UTC
(rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Add.Url.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -3,7 +3,7 @@
Contains the Add Torrent by url window.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Add.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Add.js 2010-02-04 11:17:26 UTC
(rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Add.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -3,7 +3,7 @@
Contains the Add Torrent window.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Client.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Client.js 2010-02-04 11:17:26 UTC
(rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Client.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -3,7 +3,7 @@
A JSON-RPC proxy built on top of ext-core.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.ConnectionManager.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.ConnectionManager.js
2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.ConnectionManager.js
2010-02-10 22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
Contains all objects and functions related to the connection manager.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Details.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Details.js 2010-02-04
11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Details.js 2010-02-10
22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The details tab displayed in the details panel.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Files.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Files.js 2010-02-04
11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Files.js 2010-02-10
22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The files tab displayed in the details panel.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js 2010-02-04
11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Options.js 2010-02-10
22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The options tab displayed in the details panel.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Peers.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Peers.js 2010-02-04
11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Peers.js 2010-02-10
22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The peers tab displayed in the details panel.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Status.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Status.js 2010-02-04
11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Details.Status.js 2010-02-10
22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The status tab displayed in the details panel.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Details.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Details.js 2010-02-04 11:17:26 UTC
(rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Details.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -4,7 +4,7 @@
it's containing tabs.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.EditTrackers.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.EditTrackers.js 2010-02-04
11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.EditTrackers.js 2010-02-10
22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
Contains the edit trackers window.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Events.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Events.js 2010-02-04 11:17:26 UTC
(rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Events.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -3,7 +3,7 @@
Class for holding global events that occur within the UI.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Formatters.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Formatters.js 2010-02-04
11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Formatters.js 2010-02-10
22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
Deluge.Formatters.js
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Keys.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Keys.js 2010-02-04 11:17:26 UTC
(rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Keys.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -3,7 +3,7 @@
The torrent status keys that are commonly used around the UI.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Login.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Login.js 2010-02-04 11:17:26 UTC
(rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Login.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -3,7 +3,7 @@
Contains all objects and functions related to the login system.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Menus.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Menus.js 2010-02-04 11:17:26 UTC
(rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Menus.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -3,7 +3,7 @@
Contains all the menus contained within the UI for easy access and editing.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.MoveStorage.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.MoveStorage.js 2010-02-04
11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.MoveStorage.js 2010-02-10
22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
Contains the move storage window.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.MultiOptionsManager.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.MultiOptionsManager.js
2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.MultiOptionsManager.js
2010-02-10 22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
Deluge.MultiOptionsManager.js
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.OptionsManager.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.OptionsManager.js 2010-02-04
11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.OptionsManager.js 2010-02-10
22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
Deluge.OptionsManager.js
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Plugin.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Plugin.js 2010-02-04 11:17:26 UTC
(rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Plugin.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -3,7 +3,7 @@
Contains a base class for plugins to extend.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js
2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Bandwidth.js
2010-02-10 22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The bandwidth preferences page.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js
2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Cache.js
2010-02-10 22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The cache preferences page.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js
2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Daemon.js
2010-02-10 22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The daemon preferences page.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js
2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Downloads.js
2010-02-10 22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The downloads preferences page.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Encryption.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Encryption.js
2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Encryption.js
2010-02-10 22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The encryption preferences page.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js
2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Interface.js
2010-02-10 22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The interface preferences page.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Network.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Network.js
2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Network.js
2010-02-10 22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The network preferences page.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Other.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Other.js
2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Other.js
2010-02-10 22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The other preferences page.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Plugins.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Plugins.js
2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Plugins.js
2010-02-10 22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The plugins preferences page.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js
2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Proxy.js
2010-02-10 22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The proxy preferences page.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js
2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.Queue.js
2010-02-10 22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
The queue preferences page.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.js 2010-02-04
11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Preferences.js 2010-02-10
22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
Contains the preferences window.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Remove.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Remove.js 2010-02-04 11:17:26 UTC
(rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Remove.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -3,7 +3,7 @@
Deluge.Remove.js
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Sidebar.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Sidebar.js 2010-02-04 11:17:26 UTC
(rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Sidebar.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -4,7 +4,7 @@
sidebar.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Toolbar.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Toolbar.js 2010-02-04 11:17:26 UTC
(rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Toolbar.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -3,7 +3,7 @@
Contains the Deluge toolbar.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
Added: trunk/deluge/ui/web/js/deluge-all/Deluge.Torrent.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Torrent.js
(rev 0)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Torrent.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -0,0 +1,94 @@
+/*
+Script: Deluge.Torrent.js
+ Contains the Deluge.Torrent record.
+
+Copyright:
+ (C) Damien Churchill 2009-2010 <[email protected]>
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, write to:
+ The Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor
+ Boston, MA 02110-1301, USA.
+
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of portions of this program with the OpenSSL
+ library.
+ You must obey the GNU General Public License in all respects for all of
+ the code used other than OpenSSL. If you modify file(s) with this
+ exception, you may extend this exception to your version of the file(s),
+ but you are not obligated to do so. If you do not wish to do so, delete
+ this exception statement from your version. If you delete this exception
+ statement from all source files in the program, then also delete it
here.
+*/
+
+/**
+ * Deluge.Torrent record
+ *
+ * @author Damien Churchill <[email protected]>
+ * @version 1.3
+ *
+ * @class Deluge.Torrent
+ * @extends Ext.data.Record
+ * @constructor
+ * @param {Object} data The torrents data
+ */
+Deluge.Torrent = Ext.data.Record.create([{
+ name: 'queue',
+ type: 'int'
+ }, {
+ name: 'name',
+ type: 'string'
+ }, {
+ name: 'total_size',
+ type: 'int'
+ }, {
+ name: 'state',
+ type: 'string'
+ }, {
+ name: 'progress',
+ type: 'int'
+ }, {
+ name: 'num_seeds',
+ type: 'int'
+ }, {
+ name: 'total_seeds',
+ type: 'int'
+ }, {
+ name: 'num_peers',
+ type: 'int'
+ }, {
+ name: 'total_peers',
+ type: 'int'
+ }, {
+ name: 'download_payload_rate',
+ type: 'int'
+ }, {
+ name: 'upload_payload_rate',
+ type: 'int'
+ }, {
+ name: 'eta',
+ type: 'int'
+ }, {
+ name: 'ratio',
+ type: 'float'
+ }, {
+ name: 'distributed_copies',
+ type: 'float'
+ }, {
+ name: 'time_added',
+ type: 'int'
+ }, {
+ name: 'tracker_host',
+ type: 'string'
+ }
+]);
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.Torrents.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.Torrents.js 2010-02-04
11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.Torrents.js 2010-02-10
22:15:29 UTC (rev 6170)
@@ -3,7 +3,7 @@
Contains all objects and functions related to the torrent grid.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
@@ -33,6 +33,7 @@
*/
(function() {
+
/* Renderers for the Torrent Grid */
function queueRenderer(value) {
return (value == 99999) ? '' : value + 1;
@@ -88,6 +89,10 @@
* @param {Object} config Configuration options
*/
Ext.deluge.TorrentGrid = Ext.extend(Ext.grid.GridPanel, {
+
+ // object to store contained torrent ids
+ torrents: {},
+
constructor: function(config) {
config = Ext.apply({
id: 'torrentGrid',
@@ -236,7 +241,7 @@
},
/**
- * Returns the currently selected records.
+ * Returns the currently selected record.
* @ return {Array/Ext.data.Record} The record(s) representing the rows
*/
getSelected: function() {
@@ -248,12 +253,38 @@
},
update: function(torrents) {
- // NOTE: this isn't published in the API docs so may disappear
unexpectedly
- // when upgrading Ext Js.
- var scroller = this.getView().scroller.dom;
- var scrollTop = scroller.scrollTop;
- this.getStore().loadData({"torrents": Ext.values(torrents)});
- scroller.scrollTop = scrollTop;
+ var store = this.getStore();
+ var newTorrents = [];
+
+ // Update and add any new torrents.
+ for (var t in torrents) {
+ var torrent = torrents[t];
+
+ if (this.torrents[t]) {
+ var record = store.getById(t);
+ record.beginEdit();
+ for (var k in torrent) {
+ if (record.get(k) != torrent[k]) {
+ record.set(k, torrent[k]);
+ }
+ }
+ record.endEdit();
+ } else {
+ var record = new Deluge.Torrent(torrent);
+ record.id = t;
+ this.torrents[t] = 1;
+ newTorrents.push(record);
+ }
+ }
+ store.add(newTorrents);
+
+ // Remove any torrents that should not be in the store.
+ store.each(function(record) {
+ if (!torrents[record.id]) {
+ store.remove(record);
+ }
+ });
+ store.commitChanges();
},
// private
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.UI.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.UI.js 2010-02-04 11:17:26 UTC
(rev 6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.UI.js 2010-02-10 22:15:29 UTC
(rev 6170)
@@ -4,7 +4,7 @@
of the server.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
@@ -42,6 +42,8 @@
errorCount: 0,
+ filters: null,
+
/**
* @description Create all the interface components, the json-rpc client
* and set up various events that the UI will utilise.
Modified: trunk/deluge/ui/web/js/deluge-all/Deluge.js
===================================================================
--- trunk/deluge/ui/web/js/deluge-all/Deluge.js 2010-02-04 11:17:26 UTC (rev
6169)
+++ trunk/deluge/ui/web/js/deluge-all/Deluge.js 2010-02-10 22:15:29 UTC (rev
6170)
@@ -3,7 +3,7 @@
Contains the keys for get_torrent(s)_status.
Copyright:
- (C) Damien Churchill 2009 <[email protected]>
+ (C) Damien Churchill 2009-2010 <[email protected]>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
@@ -48,6 +48,17 @@
for(var i in obj) { return false; }
return true;
},
+
+ isObjectsEqual: function(obj1, obj2) {
+ var equal = true;
+ if (!obj1 || !obj2) return false;
+ for (var i in obj1) {
+ if (obj1[i] != obj2[i]) {
+ equal = false;
+ }
+ }
+ return equal;
+ },
keys: function(obj) {
var keys = [];
Modified: trunk/deluge/ui/web/server.py
===================================================================
--- trunk/deluge/ui/web/server.py 2010-02-04 11:17:26 UTC (rev 6169)
+++ trunk/deluge/ui/web/server.py 2010-02-10 22:15:29 UTC (rev 6170)
@@ -374,6 +374,7 @@
"/js/deluge-all/Deluge.Sidebar.js",
"/js/deluge-all/Deluge.Statusbar.js",
"/js/deluge-all/Deluge.Toolbar.js",
+ "/js/deluge-all/Deluge.Torrent.js",
"/js/deluge-all/Deluge.Torrents.js",
"/js/deluge-all/Deluge.UI.js"
]
--
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.
