[Slim-Checkins] r12586 - in /trunk/server: HTML/Maestro/html/index.js strings.txt

[mherger at svn.slimdevices.com]

Author: mherger
Date: Thu Aug 16 21:37:13 2007
New Revision: 12586

URL: http://svn.slimdevices.com?rev=12586&view=rev
Log:
Bug: n/a
Description: minor simplification of the Ajax calls

Modified:
    trunk/server/HTML/Maestro/html/index.js
    trunk/server/strings.txt

Modified: trunk/server/HTML/Maestro/html/index.js
URL: http://svn.slimdevices.com/trunk/server/HTML/Maestro/html/index.js?rev=12586&r1=12585&r2=12586&view=diff
==============================================================================
--- trunk/server/HTML/Maestro/html/index.js (original)
+++ trunk/server/HTML/Maestro/html/index.js Thu Aug 16 21:37:13 2007
@@ -10,6 +10,10 @@
 
 	return {
 		init : function(){
+			Ext.Ajax.method = 'POST';
+			Ext.Ajax.url = '/jsonrpc.js'; 
+			Ext.Ajax.timeout = 4000;
+
 			pollTimer = new Ext.util.DelayedTask(Main.getStatus, this);
 			this.getStatus();
 
@@ -123,9 +127,6 @@
 
 		getUpdate : function(response){
 			Ext.Ajax.request({
-				method: 'POST',
-				url: '/jsonrpc.js', 
-				timeout: 4000,
 				failure: this.updateStatus,
 				success: this.updateStatus,
 
@@ -151,9 +152,6 @@
 		// don't request all status info to minimize performance impact on the server
 		getStatus : function() {
 			Ext.Ajax.request({
-				url: '/jsonrpc.js',
-				method: 'POST',
-				timeout: 4000,
 				params: Ext.util.JSON.encode({
 					id: 1, 
 					method: "slim.request", 
@@ -194,9 +192,6 @@
 
 		playerControl : function(action){
 			Ext.Ajax.request({
-				method: 'POST',
-				url: '/jsonrpc.js', 
-				timeout: 4000,
 				params: Ext.util.JSON.encode({
 					id: 1, 
 					method: "slim.request", 
@@ -206,7 +201,6 @@
 					]
 				}),
 				success: this.getUpdate,
-
 				scope: this
 			});
 		},

Modified: trunk/server/strings.txt
URL: http://svn.slimdevices.com/trunk/server/strings.txt?rev=12586&r1=12585&r2=12586&view=diff
==============================================================================
--- trunk/server/strings.txt (original)
+++ trunk/server/strings.txt Thu Aug 16 21:37:13 2007
@@ -13738,7 +13738,7 @@
 	EN	File & Playlist Metadata Import Debugging
 
 DEBUG_WIZARD
-       EN      Setup Wizard activity logging
+	EN	Setup Wizard activity logging
 
 SETUP_DEBUG_SERVER_LOG
 	DE	Server Logdatei