[Slim-Checkins] r11156 - in /trunk/server/HTML/EN: html/progress.js progress.html

[kdf at svn.slimdevices.com]

Author: kdf
Date: Sun Jan  7 12:41:09 2007
New Revision: 11156

URL: http://svn.slimdevices.com?rev=11156&view=rev
Log:
Bug: n/a
Description: change function names to avoid any possible collisions (ugh, global.js and common.js really need declutter )


Modified:
    trunk/server/HTML/EN/html/progress.js
    trunk/server/HTML/EN/progress.html

Modified: trunk/server/HTML/EN/html/progress.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/progress.js?rev=11156&r1=11155&r2=11156&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/progress.js (original)
+++ trunk/server/HTML/EN/html/progress.js Sun Jan  7 12:41:09 2007
@@ -1,6 +1,6 @@
 var url = "[% statusroot %]";
 
-function ajaxCallback(theData) {
+function ajaxProgressCallback(theData) {
 	
 	var parsedData = fillDataHash(theData);
 	
@@ -21,20 +21,23 @@
 				refreshElement(elems[j]+i, parsedData[elems[j]+i]);
 			}
 		}
-	
 	}
 	
-	setTimeout( "ajaxProgressRefresh()", 5000);
+	if (parsedData['message']) {
+		refreshElement('message',parsedData['message']);
+	} else {
+		setTimeout( "ajaxProgressRefresh()", 5000);
+	}
 }
 
 function ajaxProgressRefresh() {
 
 	// add a random number to the params as IE loves to cache the heck out of 
 	var args = 'type=[% type %]&barlen=[% barlen %]&ajaxRequest=1&player=[% player | uri %]&d=' + Math.random();
-	ajaxUpdate(args, ajaxCallback);
+	ajaxProgressUpdate(args, ajaxProgressCallback);
 }
 
-function ajaxUpdate(params, action) {
+function ajaxProgressUpdate(params, action) {
 	var requesttype = 'post';
 
 	if (window.XMLHttpRequest) {

Modified: trunk/server/HTML/EN/progress.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/progress.html?rev=11156&r1=11155&r2=11156&view=diff
==============================================================================
--- trunk/server/HTML/EN/progress.html (original)
+++ trunk/server/HTML/EN/progress.html Sun Jan  7 12:41:09 2007
@@ -46,15 +46,5 @@
 
 	<div id="message">[% IF message %][% message %][% END %]</div>
 
-
-[% IF refresh && NOT message %]<script language="JavaScript">
-
-setTimeout( "refresh()", [% refresh %] * 1000);
-
-function refresh() {
-}
-
-</script>[% END %]
-
 [% PROCESS pagefooter.html %]
 [% END %]