(trunk web) DRY up requested torrent fields

This just so happens to fix 2307. recheckProgress was missing
from the inital field request.

diff --git a/web/javascript/torrent.js b/web/javascript/torrent.js
index 40fd4c49e55c46ee1f0bae083f3aabf3ae15d6c4..8ec1f39a956f8255a60ab30fef710e06240a7aed 100644 (file)
--- a/web/javascript/torrent.js
+++ b/web/javascript/torrent.js
@@ -27,6 +27,14 @@ Torrent._ErrTrackerWarning     = 1;
 Torrent._ErrTrackerError       = 2;
 Torrent._ErrLocalError         = 3;
 
+Torrent._StaticFields = [ 'addedDate', 'announceURL', 'comment', 'creator',
+    'dateCreated', 'hashString', 'id', 'isPrivate', 'name', 'totalSize' ]
+Torrent._DynamicFields = [ 'downloadedEver', 'error', 'errorString', 'eta',
+    'haveUnchecked', 'haveValid', 'leechers', 'leftUntilDone', 'peersConnected',
+    'peersGettingFromUs', 'peersSendingToUs', 'rateDownload', 'rateUpload',
+    'recheckProgress', 'seeders', 'sizeWhenDone', 'status', 'swarmSpeed',
+    'uploadedEver', 'uploadRatio', 'seedRatioLimit', 'seedRatioMode', 'downloadDir' ]
+
 Torrent.prototype =
 {
        /*

diff --git a/web/javascript/transmission.remote.js b/web/javascript/transmission.remote.js
index 933b4e19d79664500341612ea1c326ffedfd04b3..73398753734d98bffc7fe4f648ceb394b3709b41 100644 (file)
--- a/web/javascript/transmission.remote.js
+++ b/web/javascript/transmission.remote.js
@@ -101,15 +101,7 @@ TransmissionRemote.prototype =
                var o = {
                        method: 'torrent-get',
                        arguments: {
-                       fields: [ 'addedDate', 'announceURL', 'comment', 'creator',
-                               'dateCreated', 'downloadedEver', 'error', 'errorString',
-                               'eta', 'hashString', 'haveUnchecked', 'haveValid', 'id',
-                               'isPrivate', 'leechers', 'leftUntilDone', 'name',
-                               'peersConnected', 'peersGettingFromUs', 'peersSendingToUs',
-                               'rateDownload', 'rateUpload', 'seeders', 'sizeWhenDone',
-                               'status', 'swarmSpeed', 'totalSize',
-                               'uploadedEver', 'uploadRatio', 'seedRatioLimit', 'seedRatioMode',
-                               'downloadDir', 'files', 'fileStats' ]
+                       fields: Torrent._StaticFields.concat(Torrent._DynamicFields, [ 'files', 'fileStats' ])
                        }
                };
 
@@ -124,13 +116,7 @@ TransmissionRemote.prototype =
                        method: 'torrent-get',
                        arguments: {
                                'ids': torrent_ids,
-                               fields: [  'id', 'downloadedEver', 'error', 'errorString',
-                                       'eta', 'haveUnchecked', 'haveValid', 'leechers', 'leftUntilDone',
-                                       'peersConnected', 'peersGettingFromUs', 'peersSendingToUs',
-                                       'rateDownload', 'rateUpload', 'recheckProgress', 'seeders',
-                                       'sizeWhenDone', 'status', 'swarmSpeed',
-                                       'uploadedEver', 'uploadRatio', 'seedRatioLimit', 'seedRatioMode',
-                                       'downloadDir' ]
+                               fields: [ 'id' ].concat(Torrent._DynamicFields)
                        }
                };