[Slim-Checkins] r9371 - in /branches/6.5/server/HTML: EN/html/global.js Fishbone/html/ajax.js Fishbone/html/scripts.js Fishbone/index.html

[kdf at svn.slimdevices.com]

Author: kdf
Date: Sat Sep  2 14:09:02 2006
New Revision: 9371

URL: http://svn.slimdevices.com?rev=9371&view=rev
Log:
merge -r9369:9370 from trunk

Modified:
    branches/6.5/server/HTML/EN/html/global.js
    branches/6.5/server/HTML/Fishbone/html/ajax.js
    branches/6.5/server/HTML/Fishbone/html/scripts.js
    branches/6.5/server/HTML/Fishbone/index.html

Modified: branches/6.5/server/HTML/EN/html/global.js
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/EN/html/global.js?rev=9371&r1=9370&r2=9371&view=diff
==============================================================================
--- branches/6.5/server/HTML/EN/html/global.js (original)
+++ branches/6.5/server/HTML/EN/html/global.js Sat Sep  2 14:09:02 2006
@@ -118,9 +118,9 @@
 	
 	var myString = new String($(item).innerHTML);
 	var rString = rpl + data + "&player";
-	var rExp= new RegExp(rpl + ".+?&player","i");
+	var rExp= new RegExp(rpl + ".*?&player","i");
 	//safari hack
-	if (rExp.exec(myString) == null) rExp= new RegExp(rpl + ".+?&player","i");
+	if (rExp.exec(myString) == null) rExp= new RegExp(rpl + ".*?&player","i");
 	$(item).innerHTML = myString.replace(rExp, rString);
 }
 

Modified: branches/6.5/server/HTML/Fishbone/html/ajax.js
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/html/ajax.js?rev=9371&r1=9370&r2=9371&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/html/ajax.js (original)
+++ branches/6.5/server/HTML/Fishbone/html/ajax.js Sat Sep  2 14:09:02 2006
@@ -131,7 +131,7 @@
 			objID.src = '[% webroot %]html/images/'+controls[i]+curstyle+'.gif';
 		}
 	}
-	
+
 	if (parsedData['isplayer']) {
 		var controls = ['rew','ffwd'];
 		
@@ -310,11 +310,11 @@
 			var plloc = top.frames.playlist.location;
 			
 			var newloc = plloc.protocol + '//' + plloc.host + plloc.pathname
-				+ plloc.search.replace(/&d=\d+/, '') + '&d=' + new Date().getTime() + plloc.hash;
+				+ plloc.search.replace(/&d=\d+/, '') + '&d=' + new Date().getTime();
 			
 			newloc=newloc.replace(playerExp, '=' + newPlayer);
 			newloc=newloc.replace(/&start=\d+&/, '&');
-			newloc=newloc.replace(/#\d+/, '#currentsong');
+			newloc=newloc + '#currentsong';
 			plloc.replace(newloc);
 			//DumperPopup([plloc,plloc.search.replace(playerExp, '='+newPlayer),plloc.search.replace(/&d=\d+/, '')]);
 		}

Modified: branches/6.5/server/HTML/Fishbone/html/scripts.js
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/html/scripts.js?rev=9371&r1=9370&r2=9371&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/html/scripts.js (original)
+++ branches/6.5/server/HTML/Fishbone/html/scripts.js Sat Sep  2 14:09:02 2006
@@ -18,7 +18,7 @@
 
 function changePlayer(player_List) {
 	player = player_List.options[player_List.selectedIndex].value;
-	setCookie('SlimServer-player',"="+player);
+	setCookie('SlimServer-player', '=' + player);
 	player = escape(player);
 	
 	var newPlayer = "=" + player;

Modified: branches/6.5/server/HTML/Fishbone/index.html
URL: http://svn.slimdevices.com/branches/6.5/server/HTML/Fishbone/index.html?rev=9371&r1=9370&r2=9371&view=diff
==============================================================================
--- branches/6.5/server/HTML/Fishbone/index.html (original)
+++ branches/6.5/server/HTML/Fishbone/index.html Sat Sep  2 14:09:02 2006
@@ -16,13 +16,13 @@
 			
 			document.write('<frameset cols="50%,*" framespacing="2" border="2">' );
 			document.write('<frameset name="home" ID="home" border="0" frameborder="no" framespacing="0" rows="55,*">');
-			document.write('<frame name="header" ID="header" scrolling="no" src="home.html?player='+cPlayer+'&page='+ getPage() +'">');
+			document.write('<frame name="header" ID="header" scrolling="no" src="home.html?player'+cPlayer+'&page='+ getPage() +'">');
 			document.write('<frame name="browser" ID="browser" src="' + getHomeCookie('SlimServer-Browserpage') +'&player'+cPlayer + '">');
 			document.write('<\/frameset>');
 			
 			document.write('<frameset name="player_frame" ID="player_frame" border="0" frameborder="no" framespacing="0" rows="260,*">');
 			document.write('<frame ID="status" name="status" scrolling="no" src="status_header.html?player'+cPlayer+'">');
-			document.write('<frame ID="playlist" name="playlist" src="playlist.html?player='+cPlayer+'">');
+			document.write('<frame ID="playlist" name="playlist" src="playlist.html?player'+cPlayer+'">');
 			document.write('<\/frameset>');
 			document.write('<\/frameset>');
 			document.close();