Changeset 12819

Timestamp:

Aug 31, 2011, 2:24:35 PM (12 years ago)

Author:

jordan

Message:

(trunk web) minor code cleanup -- fixing comments, grouping argument lists, etc.

File:

• trunk/web/javascript/transmission.js (modified) (18 diffs)

trunk/web/javascript/transmission.js

@@ -45 +45 @@
                 $('#remove_link').click(function(e) { tr.removeClicked(e); });
                 $('#prefs_save_button').click(function(e) { tr.savePrefsClicked(e); return false;});
-                $('#prefs_cancel_button').click(function(e) { tr.hidePrefsDialog(); return false; });
-                $('#block_update_button').click(function(e) { tr.remote.updateBlocklist(); return false; });
-                $('#stats_close_button').click(function(e) { tr.hideStatsDialog(); return false; });
+                $('#prefs_cancel_button').click(function() { tr.hidePrefsDialog(); return false; });
+                $('#block_update_button').click(function() { tr.remote.updateBlocklist(); return false; });
+                $('#stats_close_button').click(function() { tr.hideStatsDialog(); return false; });
                 $('.inspector_tab').click(function(e) { tr.inspectorTabClicked(e, this); });
                 $('#files_select_all').live('click', function(e) { tr.filesSelectAllClicked(e, this); });
@@ -53 +53 @@
                 $('#open_link').click(function(e) { tr.openTorrentClicked(e); });
                 $('#upload_confirm_button').click(function(e) { tr.confirmUploadClicked(e); return false;});
-                $('#upload_cancel_button').click(function(e) { tr.hideUploadDialog(); return false; });
+                $('#upload_cancel_button').click(function() { tr.hideUploadDialog(); return false; });
                 $('#turtle-button').click(function() { tr.toggleTurtleClicked(); });
                 $('#compact-button').click(function() { tr.toggleCompactClicked(); });
@@ -68 +68 @@
 
                 $(document).delegate('#torrent_list > li', 'click', function(ev) {tr.onRowClicked(ev,ev.currentTarget.row);});
-                $(document).delegate('#torrent_list > li', 'dblclick', function(e) {tr.toggleInspector();});
+                $(document).delegate('#torrent_list > li', 'dblclick', function() {tr.toggleInspector();});
         
                 $('#torrent_upload_form').submit(function() { $('#upload_confirm_button').click(); return false; });
@@ -360 +360 @@
 
         seedRatioLimit: function() {
-                if (this._prefs && this._prefs['seedRatioLimited'])
-                        return this._prefs['seedRatioLimit'];
+                var p = this._prefs;
+                if (p && p.seedRatioLimited)
+                        return p.seedRatioLimit;
                 return -1;
         },
@@ -382 +383 @@
 
         getSelectedTorrents: function() {
-                return $.map(this.getSelectedRows(),function(r) {return r.getTorrent();});
+                return $.map(this.getSelectedRows(),function(r) {
+                        return r.getTorrent();
+                });
         },
 
         getSelectedTorrentIds: function() {
-                return $.map(this.getSelectedRows(),function(r) {return r.getTorrentId();});
+                return $.map(this.getSelectedRows(),function(r) {
+                        return r.getTorrentId();
+                });
         },
 
@@ -455 +460 @@
         {
                 if (!this.selectionChangedTimer)
-                        this.selectionChangedTimer = setTimeout($.proxy(this.selectionChanged,this),200);
+                        this.selectionChangedTimer =
+                                setTimeout($.proxy(this.selectionChanged,this),200);
         },
 
@@ -470 +476 @@
         {
                 var handled = false,
-                        rows = this._rows,
+                    rows = this._rows,
                     up = ev.keyCode === 38; // up key pressed
                     dn = ev.keyCode === 40, // down key pressed
@@ -493 +499 @@
                         if (anchor >= 0)
                         {
-                                // user is extending the selection with the shift + arrow keys...
+                                // user is extending the selection
+                                // with the shift + arrow keys...
                                 if (   ((anchor <= last) && (last < i))
                                     || ((anchor >= last) && (last > i)))
@@ -530 +537 @@
         },
 
-        isButtonEnabled: function(e) {
-                var p = e.target ? e.target.parentNode : e.srcElement.parentNode;
-                return p.className!='disabled' && p.parentNode.className!='disabled';
+        isButtonEnabled: function(ev) {
+                var p = (ev.target || ev.srcElement).parentNode;
+                return p.className!=='disabled'
+                    && p.parentNode.className!=='disabled';
         },
 
@@ -704 +712 @@
         /* Turn the periodic ajax session refresh on & off */
         togglePeriodicSessionRefresh: function(enabled) {
-                clearInterval(this._periodic_session_refresh);
-                delete this._periodic_session_refresh;
+                clearInterval(this.sessionInterval);
+                delete this.sessionInterval;
                 if (enabled) {
                         var msec = this.getIntervalMsec(Prefs._SessionRefreshRate, 5);
-                        this._periodic_session_refresh = setInterval($.proxy(this.loadDaemonPrefs,this), msec);
+                        this.sessionInterval = setInterval($.proxy(this.loadDaemonPrefs,this), msec);
                 }
         },
@@ -714 +722 @@
         /* Turn the periodic ajax stats refresh on & off */
         togglePeriodicStatsRefresh: function(enabled) {
-                clearInterval(this._periodic_stats_refresh);
-                delete this._periodic_stats_refresh;
+                clearInterval(this.statsInterval);
+                delete this.statsInterval;
                 if (enabled) {
                         var msec = this.getIntervalMsec(Prefs._SessionRefreshRate, 5);
-                        this._periodic_stats_refresh = setInterval($.proxy(this.loadDaemonStats,this), msec);
+                        this.statsInterval = setInterval($.proxy(this.loadDaemonStats,this), msec);
                 }
         },
@@ -998 +1006 @@
         onTorrentChanged: function(tor)
         {
-                var id = tor.getId();
-
                 // update our dirty fields
-                this.dirtyTorrents[id] = true;
+                this.dirtyTorrents[ tor.getId() ] = true;
 
                 // enqueue ui refreshes
@@ -1010 +1016 @@
         updateFromTorrentGet: function(updates, removed_ids)
         {
-                var i, o, t, id, needed, needs, 
-                    needinfo = [];
+                var i, o, t, id, needed, needinfo = [];
 
                 for (i=0; o=updates[i]; ++i)
@@ -1020 +1025 @@
                                 needed = t.needsMetaData();
                                 t.refresh(o);
-                                needs = t.needsMetaData();
-                                if (needed && !needs)
+                                if (needed && !t.needsMetaData())
                                         needinfo.push(id);
                         }
@@ -1062 +1066 @@
         initializeTorrents: function()
         {
-                // to bootstrap, we only need to ask for the servers's torrents' ids.
-                // updateFromTorrentGet() automatically asks for the rest of the info when it gets a new id.
-                var fields = ['id'].concat(Torrent.Fields.Metadata, Torrent.Fields.Stats);
-                this.remote.updateTorrents(null, fields, this.updateFromTorrentGet, this);
+                var fields = ['id'].concat(Torrent.Fields.Metadata,
+                                           Torrent.Fields.Stats);
+                this.remote.updateTorrents(null, fields,
+                                           this.updateFromTorrentGet, this);
         },
 
@@ -1080 +1084 @@
         },
 
+        // Load the torrent fields which are only used by the inspector
         refreshInspectorTorrents: function(full)
         {
-                // some torrent fields are only used by the inspector, so we defer loading them
-                // until the user is viewing the torrent in the inspector.
-                if (this.inspectorIsVisible()) {
-                        var ids = this.getSelectedTorrentIds();
-                        if (ids && ids.length) {
-                                var fields = ['id'].concat(Torrent.Fields.StatsExtra);
-                                if (this.needsExtraInfo(ids))
-                                        fields = fields.concat(Torrent.Fields.InfoExtra);
-                                this.remote.updateTorrents(ids, fields, this.updateFromTorrentGet, this);
-                        }
+                var fields, ids=null;
+
+                if (this.inspectorIsVisible())
+                        ids = this.getSelectedTorrentIds();
+
+                if (ids && ids.length) {
+                        fields = ['id'].concat(Torrent.Fields.StatsExtra);
+                        if (this.needsExtraInfo(ids))
+                                $.merge(fields, Torrent.Fields.InfoExtra);
+                        this.remote.updateTorrents(
+                                ids, fields, this.updateFromTorrentGet, this);
                 }
         },
@@ -1166 +1172 @@
         updateStatusbar: function()
         {
+                var i, row,
+                    u=0, d=0,
+                    fmt = Transmission.fmt,
+                    torrents = this.getAllTorrents();
+
                 this.refreshFilterButton();
 
                 // up/down speed
-                var u=0, d=0;
-                var torrents = this.getAllTorrents();
-                for (var i=0, row; row=torrents[i]; ++i) {
+                for (i=0; row=torrents[i]; ++i) {
                         u += row.getUploadSpeed();
                         d += row.getDownloadSpeed();
                 }
 
-                var fmt = Transmission.fmt;
                 setInnerHTML($('#statusbar #speed-up-label')[0], u ? '&uarr; ' + fmt.speedBps(u) : '');
                 setInnerHTML($('#statusbar #speed-dn-label')[0], d ? '&darr; ' + fmt.speedBps(d) : '');
@@ -1322 +1330 @@
         },
 
-        hideMobileAddressbar: function(timeInSeconds) {
+        hideMobileAddressbar: function(delaySecs) {
                 if (isMobileDevice && !scroll_timeout) {
-                        var delayLength = timeInSeconds ? timeInSeconds*1000 : 150;
-                        scroll_timeout = setTimeout($.proxy(this.doToolbarHide,this), delayLength);
+                        var delayMsec = delaySecs*1000 || 150;
+                        scroll_timeout = setTimeout($.proxy(this.doToolbarHide,this), delayMsec);
                 }
         },