[Toss-devel-svn] SF.net SVN: toss:[1486] trunk/Toss/WebClient

[<ch...@us...>]

Revision: 1486
          http://toss.svn.sourceforge.net/toss/?rev=1486&view=rev
Author:   chalmi
Date:     2011-06-17 07:26:16 +0000 (Fri, 17 Jun 2011)

Log Message:
-----------
split plays into 2 lists: beta.

Modified Paths:
--------------
    trunk/Toss/WebClient/Main.js
    trunk/Toss/WebClient/Play.js
    trunk/Toss/WebClient/Style.css
    trunk/Toss/WebClient/index.html

Modified: trunk/Toss/WebClient/Main.js
===================================================================
--- trunk/Toss/WebClient/Main.js	2011-06-16 17:34:11 UTC (rev 1485)
+++ trunk/Toss/WebClient/Main.js	2011-06-17 07:26:16 UTC (rev 1486)
@@ -32,12 +32,12 @@
 }
 
 function make_move_continue (info) {
-    var listing_f = function (play) {
+    var listing_f = function (play) {/*
 	var old_li = document.getElementById ("plays-list-" + play.game + 
 					      "-elem-" + CUR_PLAY_I);
 	var li = new_play_item (play.game, CUR_PLAY_I);
 	old_li.parentNode.replaceChild (li, old_li);
-    };
+    */};
     var suggest_f = function (time) { suggest_move_async (time, make_move) };
     PLAYS[CUR_PLAY_I].move_continue (info, listing_f, suggest_f, disp_name);
 }
@@ -55,6 +55,25 @@
 // Play lists on display.
 
 function new_play_item (game, i) {
+
+		 var win_s = function (pl, un) {
+	//if (pl == un) { return ("You Win!"); }
+	return (disp_name(pl) + " won");
+    }
+    var subst_pl = function (pl, str) {
+	var un = pl.cur_player_uid;
+	var s = strip (' ', '\n', str);
+	if (s == "0: 1., 1: -1.") { return (win_s (pl.players[0], un)); }
+	if (s == "0: -1., 1: 1.") { return (win_s (pl.players[1], un)); }
+	if (s == "0: 0., 1: 0.") { return ("Tie"); }
+	var s1 = s.replace (/0:/g, disp_name(pl.players[0]) + ":");
+	var s2 = s1.replace (/1:/g, disp_name(pl.players[1]) + ":");
+	var s3 = s2.replace (/1.,/g, "1,");
+	var s4 = s3.replace (/0.,/g, "0,");
+	var s5 = s4.replace (/1.$/g, "1");
+	return (s5.replace (/0.$/g, "0"));
+    }
+	
     var li = document.createElement('li');
     li.setAttribute ("class", "plays-list-elem");
     li.setAttribute ("id", "plays-list-" + game + "-elem-" + i);
@@ -63,23 +82,31 @@
     var bs = '<button class="obt" title="Open game ' + PLAYS[i].pid + 
 	'" onclick="'+ "play_click('" + game + "', " + PLAYS[i].pid + ", " +
 	i + ')">' + pname + '</button> ';
-    li.innerHTML = bs
+    li.innerHTML = bs;
+    if (PLAYS[i].cur_state.payoff != "") li.innerHTML += '<span class="list_result">' + subst_pl(PLAYS[i], PLAYS[i].cur_state.payoff) + '</span>';
     // +'<a href="#" onclick="'+ "del_play('"+ fn + "')" + '">Delete</a>';
     return (li);
 }
 
+  
 function list_plays_string (game, lst) {
     PLAYS = convert_python_list ('#', lst);
-    var plist = document.getElementById("plays-list-" + game);
-    while (plist.childNodes.length > 0) { plist.removeChild(plist.firstChild); }
+    var a_plist = document.getElementById("a-plays-list-" + game);
+    var d_plist = document.getElementById("d-plays-list-" + game);
+    while (a_plist.childNodes.length > 0) { a_plist.removeChild(a_plist.firstChild); }
+    while (d_plist.childNodes.length > 0) { d_plist.removeChild(d_plist.firstChild); }
     for (var i = 0; i < PLAYS.length; i++) {
         PLAYS[i] = play_from_string (game, PLAYS[i]);
-        plist.appendChild(new_play_item (game, i));
+        if (PLAYS[i].cur_state.payoff == "") a_plist.appendChild(new_play_item (game, i));
+        else 
+        {
+          d_plist.appendChild(new_play_item (game, i));
+        }
     }
     if (PLAYS.length == 0) { 
-        document.getElementById("plays-list-" + game).style.display = "none";
+        document.getElementById("a-plays-list-" + game).style.display = "none";
     } else {
-        document.getElementById("plays-list-" + game).style.display = "block";
+        document.getElementById("a-plays-list-" + game).style.display = "block";
     }
 }
 
@@ -238,7 +265,7 @@
     while (olist.childNodes.length > 0) { olist.removeChild(olist.firstChild); }
     if (opp_uid == -1) { opp_uid = UNAME; }
     if (opp_uid == 0 || UNAME == "") { return; }
-    document.getElementById("plays-list-" + GAME_NAME).style.display = "block";
+    //document.getElementById("plays-list-" + GAME_NAME).style.display = "block";
     document.getElementById("working").style.display = "block";
     info_nbr = CONN.new_play (GAME_NAME, UNAME, opp_uid);
     document.getElementById("working").style.display = "none";
@@ -253,8 +280,8 @@
 		      info_nbr.substring(info_idx+1), UNAME);
     PLAYS.push(p);
     p.redraw (disp_name);
-    li = new_play_item (GAME_NAME, CUR_PLAY_I);
-    document.getElementById("plays-list-" + GAME_NAME).appendChild(li);
+    //li = new_play_item (GAME_NAME, CUR_PLAY_I);
+    //document.getElementById("plays-list-" + GAME_NAME).appendChild(li);
 }
 
 function get_opponents () {

Modified: trunk/Toss/WebClient/Play.js
===================================================================
--- trunk/Toss/WebClient/Play.js	2011-06-16 17:34:11 UTC (rev 1485)
+++ trunk/Toss/WebClient/Play.js	2011-06-17 07:26:16 UTC (rev 1486)
@@ -68,6 +68,7 @@
 	return (s5.replace (/0.$/g, "0"));
     }
     
+    
     if (! SIMPLE_MOVES) {
 	document.getElementById("working").style.display = "block";
     }

Modified: trunk/Toss/WebClient/Style.css
===================================================================
--- trunk/Toss/WebClient/Style.css	2011-06-16 17:34:11 UTC (rev 1485)
+++ trunk/Toss/WebClient/Style.css	2011-06-17 07:26:16 UTC (rev 1486)
@@ -221,6 +221,11 @@
     top: 2px;
 }
 
+.list_result
+{
+	font-size: 0.9em
+}
+
 #remember {
     margin: 0px;
     padding: 0px;

Modified: trunk/Toss/WebClient/index.html
===================================================================
--- trunk/Toss/WebClient/index.html	2011-06-16 17:34:11 UTC (rev 1485)
+++ trunk/Toss/WebClient/index.html	2011-06-17 07:26:16 UTC (rev 1486)
@@ -197,69 +197,96 @@
     <button onclick="new_play('Breakthrough')"
 	    class="boldobt">Breakthrough</button>
   </p>  
-  <ul class="plays-list" id="plays-list-Breakthrough">
+<ul class="plays-list" id="a-plays-list-Breakthrough">
     <li style="display: none;"/>
   </ul>
+	<ul class="plays-list" id="d-plays-list-Breakthrough">
+		<li style="display: none;"/>
+	</ul>	
   <p class="game-par">
     <button onclick="new_play('Checkers')"
             class="boldobt">Checkers</button>
   </p>
-  <ul class="plays-list" id="plays-list-Checkers">
+  <ul class="plays-list" id="a-plays-list-Checkers">
     <li style="display: none;"/>
   </ul>
+	<ul class="plays-list" id="d-plays-list-Checkers">
+		<li style="display: none;"/>
+	</ul>
   <p class="game-par">
     <button onclick="new_play('Chess')"
 	    class="boldobt">Chess</button>
   </p>
-  <ul class="plays-list" id="plays-list-Chess">
+  <ul class="plays-list" id="a-plays-list-Chess">
     <li style="display: none;"/>
   </ul>
+	<ul class="plays-list" id="d-plays-list-Chess">
+		<li style="display: none;"/>
+	</ul>
   <p class="game-par">
     <button onclick="new_play('Connect4')"
 	    class="boldobt">Connect4</button>
   </p>
-  <ul class="plays-list" id="plays-list-Connect4">
+  <ul class="plays-list" id="a-plays-list-Connect4">
     <li style="display: none;"/>
   </ul>
+	<ul class="plays-list" id="d-plays-list-Connect4">
+		<li style="display: none;"/>
+	</ul>
   <p class="game-par">
     <button onclick="new_play('Entanglement')"
 	    class="boldobt">Entanglement</button>
   </p>
-  <ul class="plays-list" id="plays-list-Entanglement">
+  <ul class="plays-list" id="a-plays-list-Entanglement">
     <li style="display: none;"/>
   </ul>
+	<ul class="plays-list" id="d-plays-list-Entanglement">
+		<li style="display: none;"/>
+	</ul>
   <p class="game-par">
     <button onclick="new_play('Gomoku')"
 	    class="boldobt">Gomoku</button>
   </p>
-  <ul class="plays-list" id="plays-list-Gomoku">
+  <ul class="plays-list" id="a-plays-list-Gomoku">
     <li style="display: none;"/>
   </ul>
+	<ul class="plays-list" id="d-plays-list-Gomoku">
+		<li style="display: none;"/>
+	</ul>
   <p class="game-par">
     <button onclick="new_play('Pawn-Whopping')"
 	    class="boldobt">Pawn-Whopping</button>
   </p>
-  <ul class="plays-list" id="plays-list-Pawn-Whopping">
+  <ul class="plays-list" id="a-plays-list-Pawn-Whopping">
     <li style="display: none;"/>
   </ul>
+	<ul class="plays-list" id="d-plays-list-Pawn-Whopping">
+    	<li style="display: none;"/>
+  	</ul>
   <p class="game-par">
     <button onclick="new_play('Tic-Tac-Toe')"
 	    class="boldobt">Tic-Tac-Toe</button>
   </p>
-  <ul class="plays-list" id="plays-list-Tic-Tac-Toe">
+  <ul class="plays-list" id="a-plays-list-Tic-Tac-Toe">
     <li style="display: none;"/>
   </ul>
-  <p class="game-par" style="display: none;">
+	<ul class="plays-list" id="d-plays-list-Tic-Tac-Toe">
+		<li style="display: none;"/>
+  	</ul>
+  <p class="game-par">
     <button onclick="new_play('Concurrent-Tic-Tac-Toe')"
 	    class="boldobt">Concurrent-Tic-Tac-Toe</button>
   </p>
-  <ul class="plays-list" style="display: none;" 
-      id="plays-list-Concurrent-Tic-Tac-Toe">
+  <ul class="plays-list" id="a-plays-list-Concurrent-Tic-Tac-Toe">
     <li style="display: none;"/>
   </ul>
+	<ul class="plays-list" id="d-plays-list-Concurrent-Tic-Tac-Toe">
+		<li style="display: none;"/>
+	</ul>
 </div>
 
 
+
 <div id="game-disp">
   <p id="game-info-par">
     <span id="game-title"></span>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.