Author: damoxc
Revision: 5917
Log:
remove the connected call upon an update to reduce the number of ajax
calls
Diff:
Modified: branches/1.2_RC/deluge/ui/web/js/Deluge.UI.js
===================================================================
--- branches/1.2_RC/deluge/ui/web/js/Deluge.UI.js 2009-11-03 22:08:18 UTC
(rev 5916)
+++ branches/1.2_RC/deluge/ui/web/js/Deluge.UI.js 2009-11-04 19:54:59 UTC
(rev 5917)
@@ -1,35 +1,35 @@
/*
Script: Deluge.UI.js
- The core ui module that builds up the ui layout and controls the polling
- of the server.
+ The core ui module that builds up the ui layout and controls the polling
+ of the server.
Copyright:
- (C) Damien Churchill 2009 <[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.
+ (C) Damien Churchill 2009 <[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.
+ 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.
+ 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.
+ 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.
*/
/**
@@ -40,160 +40,151 @@
*/
Deluge.UI = {
- errorCount: 0,
+ errorCount: 0,
- /**
- * @description Create all the interface components, the json-rpc client
- * and set up various events that the UI will utilise.
- */
- initialize: function() {
- this.MainPanel = new Ext.Panel({
- id: 'mainPanel',
- iconCls: 'x-deluge-main-panel',
- title: 'Deluge',
- layout: 'border',
- tbar: Deluge.Toolbar,
- items: [
- Deluge.Sidebar,
- Deluge.Details,
- Deluge.Torrents
- ],
- bbar: Deluge.Statusbar
- });
+ /**
+ * @description Create all the interface components, the json-rpc client
+ * and set up various events that the UI will utilise.
+ */
+ initialize: function() {
+ this.MainPanel = new Ext.Panel({
+ id: 'mainPanel',
+ iconCls: 'x-deluge-main-panel',
+ title: 'Deluge',
+ layout: 'border',
+ tbar: Deluge.Toolbar,
+ items: [
+ Deluge.Sidebar,
+ Deluge.Details,
+ Deluge.Torrents
+ ],
+ bbar: Deluge.Statusbar
+ });
- this.Viewport = new Ext.Viewport({
- layout: 'fit',
- items: [this.MainPanel]
- });
-
- Deluge.Events.on("connect", this.onConnect, this);
- Deluge.Events.on("disconnect", this.onDisconnect, this);
- Deluge.Client = new Ext.ux.util.RpcClient({
- url: '/json'
- });
-
- for (var plugin in Deluge.Plugins) {
- plugin = Deluge.Plugins[plugin];
- plugin.enable();
- }
-
- Deluge.Client.on('connected', function(e) {
- Deluge.Login.show();
- Deluge.Events.start();
- Deluge.Events.on('PluginEnabledEvent', this.onPluginEnabled, this);
- Deluge.Events.on('PluginDisabledEvent', this.onPluginDisabled,
this);
- }, this, {single: true});
-
- this.update = this.update.bind(this);
- },
+ this.Viewport = new Ext.Viewport({
+ layout: 'fit',
+ items: [this.MainPanel]
+ });
+
+ Deluge.Events.on("connect", this.onConnect, this);
+ Deluge.Events.on("disconnect", this.onDisconnect, this);
+ Deluge.Client = new Ext.ux.util.RpcClient({
+ url: '/json'
+ });
+
+ for (var plugin in Deluge.Plugins) {
+ plugin = Deluge.Plugins[plugin];
+ plugin.enable();
+ }
+
+ Deluge.Client.on('connected', function(e) {
+ Deluge.Login.show();
+ Deluge.Events.start();
+ Deluge.Events.on('PluginEnabledEvent',
this.onPluginEnabled, this);
+ Deluge.Events.on('PluginDisabledEvent',
this.onPluginDisabled, this);
+ }, this, {single: true});
+
+ this.update = this.update.bind(this);
+ },
- update: function() {
- var filters = Deluge.Sidebar.getFilters();
- Deluge.Client.web.update_ui(Deluge.Keys.Grid, filters, {
- success: this.onUpdate,
- failure: this.onUpdateError,
- scope: this
- });
- Deluge.Details.update();
- Deluge.Client.web.connected({
- success: this.onConnectedCheck,
- scope: this
- });
- },
+ update: function() {
+ var filters = Deluge.Sidebar.getFilters();
+ Deluge.Client.web.update_ui(Deluge.Keys.Grid, filters, {
+ success: this.onUpdate,
+ failure: this.onUpdateError,
+ scope: this
+ });
+ Deluge.Details.update();
+ },
- onConnectedCheck: function(connected) {
- if (!connected) {
- Deluge.Events.fire('disconnect');
- }
- },
+ onUpdateError: function(error) {
+ if (this.errorCount == 2) {
+ Ext.MessageBox.show({
+ title: 'Lost Connection',
+ msg: 'The connection to the webserver has been
lost!',
+ buttons: Ext.MessageBox.OK,
+ icon: Ext.MessageBox.ERROR
+ });
+ }
+ this.errorCount++;
+ },
- onUpdateError: function(error) {
- if (this.errorCount == 2) {
- Ext.MessageBox.show({
- title: 'Lost Connection',
- msg: 'The connection to the webserver has been lost!',
- buttons: Ext.MessageBox.OK,
- icon: Ext.MessageBox.ERROR
- });
- }
- this.errorCount++;
- },
+ /**
+ * @static
+ * @private
+ * Updates the various components in the interface.
+ */
+ onUpdate: function(data) {
+ if (!data['connected']) Deluge.Events.fire('disconnect');
+ Deluge.Torrents.update(data['torrents']);
+ Deluge.Statusbar.update(data['stats']);
+ Deluge.Sidebar.update(data['filters']);
+ this.errorCount = 0;
+ },
- /**
- * @static
- * @private
- * Updates the various components in the interface.
- */
- onUpdate: function(data) {
- Deluge.Torrents.update(data['torrents']);
- Deluge.Statusbar.update(data['stats']);
- Deluge.Sidebar.update(data['filters']);
- this.errorCount = 0;
- },
+ /**
+ * @static
+ * @private
+ * Start the Deluge UI polling the server and update the interface.
+ */
+ onConnect: function() {
+ if (!this.running) {
+ this.running = setInterval(this.update, 2000);
+ this.update();
+ }
+ },
- /**
- * @static
- * @private
- * Start the Deluge UI polling the server and update the interface.
- */
- onConnect: function() {
- if (!this.running) {
- this.running = setInterval(this.update, 2000);
- this.update();
- }
- },
+ /**
+ * @static
+ * @private
+ */
+ onDisconnect: function() {
+ this.stop();
+ },
- /**
- * @static
- * @private
- */
- onDisconnect: function() {
- this.stop();
- },
+ onPluginEnabled: function(pluginName) {
+ Deluge.Client.web.get_plugin_resources(pluginName, {
+ success: this.onGotPluginResources,
+ scope: this
+ })
+ },
- onPluginEnabled: function(pluginName) {
- Deluge.Client.web.get_plugin_resources(pluginName, {
- success: this.onGotPluginResources,
- scope: this
- })
- },
+ onGotPluginResources: function(resources) {
+ var scripts = (Deluge.debug) ? resources.debug_scripts :
resources.scripts;
+ Ext.each(scripts, function(script) {
+ Ext.ux.JSLoader({
+ url: script,
+ onLoad: this.onPluginLoaded,
+ pluginName: resources.name
+ });
+ }, this);
+ },
- onGotPluginResources: function(resources) {
- var scripts = (Deluge.debug) ? resources.debug_scripts :
resources.scripts;
- Ext.each(scripts, function(script) {
- Ext.ux.JSLoader({
- url: script,
- onLoad: this.onPluginLoaded,
- pluginName: resources.name
- });
- }, this);
- },
+ onPluginDisabled: function(pluginName) {
+ Deluge.Plugins[pluginName].disable();
+ },
- onPluginDisabled: function(pluginName) {
- Deluge.Plugins[pluginName].disable();
- },
+ onPluginLoaded: function(options) {
+ // This could happen if the plugin has multiple scripts
+ if (!Deluge.Plugins[options.pluginName]) return;
- onPluginLoaded: function(options) {
- // This could happen if the plugin has multiple scripts
- if (!Deluge.Plugins[options.pluginName]) return;
+ // Enable the plugin
+ Deluge.Plugins[options.pluginName].enable();
+ },
- // Enable the plugin
- Deluge.Plugins[options.pluginName].enable();
-},
-
- /**
- * @static
- * Stop the Deluge UI polling the server and clear the interface.
- */
- stop: function() {
- if (this.running) {
- clearInterval(this.running);
- this.running = false;
- Deluge.Torrents.getStore().loadData([]);
- }
- }
+ /**
+ * @static
+ * Stop the Deluge UI polling the server and clear the interface.
+ */
+ stop: function() {
+ if (this.running) {
+ clearInterval(this.running);
+ this.running = false;
+ Deluge.Torrents.getStore().removeAll();
+ }
+ }
}
Ext.onReady(function(e) {
- Deluge.UI.initialize();
-});
\ No newline at end of file
+ Deluge.UI.initialize();
+});
Modified: branches/1.2_RC/deluge/ui/web/json_api.py
===================================================================
--- branches/1.2_RC/deluge/ui/web/json_api.py 2009-11-03 22:08:18 UTC (rev
5916)
+++ branches/1.2_RC/deluge/ui/web/json_api.py 2009-11-04 19:54:59 UTC (rev
5917)
@@ -457,6 +457,7 @@
"""
d = Deferred()
ui_info = {
+ "connected": client.connected(),
"torrents": None,
"filters": None,
"stats": {
Modified: trunk/deluge/ui/web/js/Deluge.UI.js
===================================================================
--- trunk/deluge/ui/web/js/Deluge.UI.js 2009-11-03 22:08:18 UTC (rev 5916)
+++ trunk/deluge/ui/web/js/Deluge.UI.js 2009-11-04 19:54:59 UTC (rev 5917)
@@ -1,35 +1,35 @@
/*
Script: Deluge.UI.js
- The core ui module that builds up the ui layout and controls the polling
- of the server.
+ The core ui module that builds up the ui layout and controls the polling
+ of the server.
Copyright:
- (C) Damien Churchill 2009 <[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.
+ (C) Damien Churchill 2009 <[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.
+ 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.
+ 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.
+ 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.
*/
/**
@@ -40,160 +40,151 @@
*/
Deluge.UI = {
- errorCount: 0,
+ errorCount: 0,
- /**
- * @description Create all the interface components, the json-rpc client
- * and set up various events that the UI will utilise.
- */
- initialize: function() {
- this.MainPanel = new Ext.Panel({
- id: 'mainPanel',
- iconCls: 'x-deluge-main-panel',
- title: 'Deluge',
- layout: 'border',
- tbar: Deluge.Toolbar,
- items: [
- Deluge.Sidebar,
- Deluge.Details,
- Deluge.Torrents
- ],
- bbar: Deluge.Statusbar
- });
+ /**
+ * @description Create all the interface components, the json-rpc client
+ * and set up various events that the UI will utilise.
+ */
+ initialize: function() {
+ this.MainPanel = new Ext.Panel({
+ id: 'mainPanel',
+ iconCls: 'x-deluge-main-panel',
+ title: 'Deluge',
+ layout: 'border',
+ tbar: Deluge.Toolbar,
+ items: [
+ Deluge.Sidebar,
+ Deluge.Details,
+ Deluge.Torrents
+ ],
+ bbar: Deluge.Statusbar
+ });
- this.Viewport = new Ext.Viewport({
- layout: 'fit',
- items: [this.MainPanel]
- });
-
- Deluge.Events.on("connect", this.onConnect, this);
- Deluge.Events.on("disconnect", this.onDisconnect, this);
- Deluge.Client = new Ext.ux.util.RpcClient({
- url: '/json'
- });
-
- for (var plugin in Deluge.Plugins) {
- plugin = Deluge.Plugins[plugin];
- plugin.enable();
- }
-
- Deluge.Client.on('connected', function(e) {
- Deluge.Login.show();
- Deluge.Events.start();
- Deluge.Events.on('PluginEnabledEvent', this.onPluginEnabled, this);
- Deluge.Events.on('PluginDisabledEvent', this.onPluginDisabled,
this);
- }, this, {single: true});
-
- this.update = this.update.bind(this);
- },
+ this.Viewport = new Ext.Viewport({
+ layout: 'fit',
+ items: [this.MainPanel]
+ });
+
+ Deluge.Events.on("connect", this.onConnect, this);
+ Deluge.Events.on("disconnect", this.onDisconnect, this);
+ Deluge.Client = new Ext.ux.util.RpcClient({
+ url: '/json'
+ });
+
+ for (var plugin in Deluge.Plugins) {
+ plugin = Deluge.Plugins[plugin];
+ plugin.enable();
+ }
+
+ Deluge.Client.on('connected', function(e) {
+ Deluge.Login.show();
+ Deluge.Events.start();
+ Deluge.Events.on('PluginEnabledEvent',
this.onPluginEnabled, this);
+ Deluge.Events.on('PluginDisabledEvent',
this.onPluginDisabled, this);
+ }, this, {single: true});
+
+ this.update = this.update.bind(this);
+ },
- update: function() {
- var filters = Deluge.Sidebar.getFilters();
- Deluge.Client.web.update_ui(Deluge.Keys.Grid, filters, {
- success: this.onUpdate,
- failure: this.onUpdateError,
- scope: this
- });
- Deluge.Details.update();
- Deluge.Client.web.connected({
- success: this.onConnectedCheck,
- scope: this
- });
- },
+ update: function() {
+ var filters = Deluge.Sidebar.getFilters();
+ Deluge.Client.web.update_ui(Deluge.Keys.Grid, filters, {
+ success: this.onUpdate,
+ failure: this.onUpdateError,
+ scope: this
+ });
+ Deluge.Details.update();
+ },
- onConnectedCheck: function(connected) {
- if (!connected) {
- Deluge.Events.fire('disconnect');
- }
- },
+ onUpdateError: function(error) {
+ if (this.errorCount == 2) {
+ Ext.MessageBox.show({
+ title: 'Lost Connection',
+ msg: 'The connection to the webserver has been
lost!',
+ buttons: Ext.MessageBox.OK,
+ icon: Ext.MessageBox.ERROR
+ });
+ }
+ this.errorCount++;
+ },
- onUpdateError: function(error) {
- if (this.errorCount == 2) {
- Ext.MessageBox.show({
- title: 'Lost Connection',
- msg: 'The connection to the webserver has been lost!',
- buttons: Ext.MessageBox.OK,
- icon: Ext.MessageBox.ERROR
- });
- }
- this.errorCount++;
- },
+ /**
+ * @static
+ * @private
+ * Updates the various components in the interface.
+ */
+ onUpdate: function(data) {
+ if (!data['connected']) Deluge.Events.fire('disconnect');
+ Deluge.Torrents.update(data['torrents']);
+ Deluge.Statusbar.update(data['stats']);
+ Deluge.Sidebar.update(data['filters']);
+ this.errorCount = 0;
+ },
- /**
- * @static
- * @private
- * Updates the various components in the interface.
- */
- onUpdate: function(data) {
- Deluge.Torrents.update(data['torrents']);
- Deluge.Statusbar.update(data['stats']);
- Deluge.Sidebar.update(data['filters']);
- this.errorCount = 0;
- },
+ /**
+ * @static
+ * @private
+ * Start the Deluge UI polling the server and update the interface.
+ */
+ onConnect: function() {
+ if (!this.running) {
+ this.running = setInterval(this.update, 2000);
+ this.update();
+ }
+ },
- /**
- * @static
- * @private
- * Start the Deluge UI polling the server and update the interface.
- */
- onConnect: function() {
- if (!this.running) {
- this.running = setInterval(this.update, 2000);
- this.update();
- }
- },
+ /**
+ * @static
+ * @private
+ */
+ onDisconnect: function() {
+ this.stop();
+ },
- /**
- * @static
- * @private
- */
- onDisconnect: function() {
- this.stop();
- },
+ onPluginEnabled: function(pluginName) {
+ Deluge.Client.web.get_plugin_resources(pluginName, {
+ success: this.onGotPluginResources,
+ scope: this
+ })
+ },
- onPluginEnabled: function(pluginName) {
- Deluge.Client.web.get_plugin_resources(pluginName, {
- success: this.onGotPluginResources,
- scope: this
- })
- },
+ onGotPluginResources: function(resources) {
+ var scripts = (Deluge.debug) ? resources.debug_scripts :
resources.scripts;
+ Ext.each(scripts, function(script) {
+ Ext.ux.JSLoader({
+ url: script,
+ onLoad: this.onPluginLoaded,
+ pluginName: resources.name
+ });
+ }, this);
+ },
- onGotPluginResources: function(resources) {
- var scripts = (Deluge.debug) ? resources.debug_scripts :
resources.scripts;
- Ext.each(scripts, function(script) {
- Ext.ux.JSLoader({
- url: script,
- onLoad: this.onPluginLoaded,
- pluginName: resources.name
- });
- }, this);
- },
+ onPluginDisabled: function(pluginName) {
+ Deluge.Plugins[pluginName].disable();
+ },
- onPluginDisabled: function(pluginName) {
- Deluge.Plugins[pluginName].disable();
- },
+ onPluginLoaded: function(options) {
+ // This could happen if the plugin has multiple scripts
+ if (!Deluge.Plugins[options.pluginName]) return;
- onPluginLoaded: function(options) {
- // This could happen if the plugin has multiple scripts
- if (!Deluge.Plugins[options.pluginName]) return;
+ // Enable the plugin
+ Deluge.Plugins[options.pluginName].enable();
+ },
- // Enable the plugin
- Deluge.Plugins[options.pluginName].enable();
-},
-
- /**
- * @static
- * Stop the Deluge UI polling the server and clear the interface.
- */
- stop: function() {
- if (this.running) {
- clearInterval(this.running);
- this.running = false;
- Deluge.Torrents.getStore().loadData([]);
- }
- }
+ /**
+ * @static
+ * Stop the Deluge UI polling the server and clear the interface.
+ */
+ stop: function() {
+ if (this.running) {
+ clearInterval(this.running);
+ this.running = false;
+ Deluge.Torrents.getStore().removeAll();
+ }
+ }
}
Ext.onReady(function(e) {
- Deluge.UI.initialize();
-});
\ No newline at end of file
+ Deluge.UI.initialize();
+});
Modified: trunk/deluge/ui/web/json_api.py
===================================================================
--- trunk/deluge/ui/web/json_api.py 2009-11-03 22:08:18 UTC (rev 5916)
+++ trunk/deluge/ui/web/json_api.py 2009-11-04 19:54:59 UTC (rev 5917)
@@ -457,6 +457,7 @@
"""
d = Deferred()
ui_info = {
+ "connected": client.connected(),
"torrents": None,
"filters": None,
"stats": {
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
