[Slim-Checkins] r11157 - /trunk/server/HTML/EN/html/home.js

kdf at svn.slimdevices.com kdf at svn.slimdevices.com
Sun Jan 7 13:48:18 PST 2007


Author: kdf
Date: Sun Jan  7 13:48:18 2007
New Revision: 11157

URL: http://svn.slimdevices.com?rev=11157&view=rev
Log:
Bug: n/a
Description: remove the need for a full page refresh of home page when scan is complete.


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

Modified: trunk/server/HTML/EN/html/home.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/home.js?rev=11157&r1=11156&r2=11157&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/home.js (original)
+++ trunk/server/HTML/EN/html/home.js Sun Jan  7 13:48:18 2007
@@ -10,12 +10,14 @@
 		if ($('scanWarning')) showElements(['scanWarning'],'inline');
 		
 		var elements = ['progressName', 'progressBar', 'progressDone', 'progressTotal'];
-		var data = ['progressname', 'progressbar', 'progressdone', 'progresstotal']
 		
 		for (var i=0; i < elements.length; i++) {
-			if (parsedData[data[i]]) {
-				if ($(elements[i])) showElements([elements[i]],'inline');
-				refreshElement(elements[i], parsedData[data[i]]);
+		
+			if (parsedData[elements[i].toLowerCase()]) {
+				if ($(elements[i])) {
+					showElements([elements[i]],'inline');
+					refreshElement(elements[i], parsedData[elements[i].toLowerCase()]);
+				}
 			} else {
 				if ($(elements[i])) hideElements([elements[i]]);
 			}
@@ -36,18 +38,20 @@
 		setTimeout( "ajaxHomeRefresh()", 5 * 1000);
 	} else {
 	
-		refresh();
+		if ($('scanWarning'))  hideElements(['scanWarning']);
+		if ($('progressName')) hideElements(['progressName']);
+		if ($('progressBar'))  hideElements(['progressBar']);
+		
+		if ($('libraryInfo'))  showElements(['libraryInfo'],'inline');
 		
 		var elements = ['songcount', 'albumcount', 'artistcount'];
 		
 		for (var i=0; i < elements.length; i++) {
-			if (parsedData[data[i]]) {
-				refreshElement(elements[i], parsedData[data[i]]);
+			if (parsedData[elements[i]]) {
+				refreshElement(elements[i], parsedData[elements[i]]);
 			} 
 		}
 		
-		if ($('scanWarning')) hideElements(['scanWarning']);
-		if ($('libraryInfo')) showElements(['libraryInfo'],'inline');
 	}
 }
 
@@ -64,12 +68,6 @@
 		
 		if (useAjax == 1) {
 			setTimeout( "ajaxHomeRefresh()", 1000);
-		} else {
-			setTimeout( "refresh()", 300*1000);
 		}
 	}
-		
-	function refresh() {
-		window.location.replace("home.html?player=[% player | uri %]");
-	}
 [% END %]



More information about the checkins mailing list