[Slim-Checkins] r8856 - in /trunk/server/HTML: EN/html/common.js EN/html/global.js Fishbone/html/ajax.js

[kdf at svn.slimdevices.com]

Author: kdf
Date: Tue Aug  8 00:04:10 2006
New Revision: 8856

URL: http://svn.slimdevices.com?rev=8856&view=rev
Log:
Bug: 3882 (partial)
Description: keep artwork param if it exists when changing album sort order.  
	some whitepace cleanup in the ajax scripts

Modified:
    trunk/server/HTML/EN/html/common.js
    trunk/server/HTML/EN/html/global.js
    trunk/server/HTML/Fishbone/html/ajax.js

Modified: trunk/server/HTML/EN/html/common.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/common.js?rev=8856&r1=8855&r2=8856&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/common.js (original)
+++ trunk/server/HTML/EN/html/common.js Tue Aug  8 00:04:10 2006
@@ -95,7 +95,7 @@
 
 function chooseAlbumOrderBy(value, option)
 {
-	var url = '[% webroot %]browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %]&player=[% playerURI %]';
+	var url = '[% webroot %]browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %][% IF artwork %]&artwork=1[% END %]&player=[% playerURI %]';
 
 	if (option) {
 		url = url + '&orderBy=' + option;

Modified: trunk/server/HTML/EN/html/global.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/global.js?rev=8856&r1=8855&r2=8856&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/global.js (original)
+++ trunk/server/HTML/EN/html/global.js Tue Aug  8 00:04:10 2006
@@ -45,19 +45,21 @@
 // params is a list of args to send to url
 // action is the function to be called after the ajaxRequest.txt file is spit back
 function getStatusData(params, action) {
-	var requesttype = 'post';
-	if (window.XMLHttpRequest) {
-		requesttype = 'get';
-	}
-	var myAjax = new Ajax.Request(
-	url,
-	{
-		method: requesttype,
+	var requesttype = 'post';
+
+	if (window.XMLHttpRequest) {
+		requesttype = 'get';
+	}
+
+	var myAjax = new Ajax.Request(
+	url,
+	{
+		method: requesttype,
 		postBody: params,
-		parameters: params,
-		onComplete: action,
-		requestHeaders:['Referer', document.location.href]
-	});
+		parameters: params,
+		onComplete: action,
+		requestHeaders:['Referer', document.location.href]
+	});
 }
 
 // doRefresh
@@ -166,8 +168,8 @@
 }
 
 function displayLibraryInfo(theData) {
-        var myData = theData.responseText;
-        var homeParsedData = parseData(myData);
+	var myData = theData.responseText;
+	var homeParsedData = parseData(myData);
 	var libraryString = homeParsedData['song_count'] +', '+ homeParsedData['artist_count'] +', '+ homeParsedData['album_count'];
 	if ($('libraryInfo')) {
 		$('libraryInfo').innerHTML = libraryString;
@@ -190,7 +192,7 @@
 			tableObj.deleteRow(r);
 		}
 		return null;
-        }
+	}
 }
 
 // miniControls is for putting play/pause on any page. ajax request is made via status.html

Modified: trunk/server/HTML/Fishbone/html/ajax.js
URL: http://svn.slimdevices.com/trunk/server/HTML/Fishbone/html/ajax.js?rev=8856&r1=8855&r2=8856&view=diff
==============================================================================
--- trunk/server/HTML/Fishbone/html/ajax.js (original)
+++ trunk/server/HTML/Fishbone/html/ajax.js Tue Aug  8 00:04:10 2006
@@ -190,16 +190,14 @@
 		showElements(['notplaying']);
 	}
 
-	if (parsedData['isplayer']) {
-		showElements(['playCtlffwd']);
-		showElements(['playCtlrew']);
-		showElements(['playCtlmute']);
-		showElements(['volumeControl']);
-	} else {
-		hideElements(['playCtlffwd']);
-		hideElements(['playCtlrew']);
-		hideElements(['playCtlmute']);
-		hideElements(['volumeControl']);
+	var playeronly = ['playCtlffwd', 'playCtlrew', 'playCtlmute', 'volumeControl'];
+	for (var i=0; i < playeronly.length; i++) {
+		var key = elems[i];
+		if (parsedData['isplayer']) {
+			showElements([key]);
+		} else {
+			showElements([key]);
+		}
 	}
 	
 	// refresh cover art