diff --git a/web/javascript/transmission.js b/web/javascript/transmission.js index 51c50520a..4999bf5a5 100644 --- a/web/javascript/transmission.js +++ b/web/javascript/transmission.js @@ -113,12 +113,21 @@ Transmission.prototype = // Get preferences & torrents from the daemon var tr = this; - this.remote.loadDaemonPrefs( ); + this.loadDaemonPrefs( ); this.initalizeAllTorrents(); this.togglePeriodicRefresh( true ); }, + loadDaemonPrefs: function(){ + var tr = this; + this.remote.loadDaemonPrefs( function(data){ + var o = data.arguments; + Prefs.getClutchPrefs( o ); + tr.updatePrefs( o ); + }); + }, + preloadImages: function() { if (iPhone) { this.loadImages( diff --git a/web/javascript/transmission.remote.js b/web/javascript/transmission.remote.js index 8a33d232e..dc3bbf290 100644 --- a/web/javascript/transmission.remote.js +++ b/web/javascript/transmission.remote.js @@ -87,14 +87,10 @@ TransmissionRemote.prototype = } ); }, - loadDaemonPrefs: function() { + loadDaemonPrefs: function( callback ) { var tr = this._controller; var o = { method: 'session-get' }; - this.sendRequest( o, function(data) { - var o = data.arguments; - Prefs.getClutchPrefs( o ); - tr.updatePrefs( o ); - } ); + this.sendRequest( o, callback ); }, getInitialDataFor: function(torrent_ids, callback) { @@ -224,7 +220,7 @@ TransmissionRemote.prototype = arguments: args }; this.sendRequest( o, function() { - remote.loadDaemonPrefs(); + remote._controller.loadDaemonPrefs(); } ); } };