www

commit c5415d371837776f3429ec6378f30de687496e41
parent 8c36a6293e081e7ea4051b4003837fd1935ca639
Author: Bertrand Brun <bertrand0brun@gmail.com>
Date:   Thu, 28 Apr 2011 15:14:01 +0200

Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable

Diffstat:
M
code/serveur/php/createGame.php
 | 
4
++--
M
code/serveur/php/ressources/backend.inc
 | 
2
+-
M
code/serveur/php/ressources/createGame.js
 | 
14
++++++++------

3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/code/serveur/php/createGame.php b/code/serveur/php/createGame.php
@@ -25,11 +25,11 @@ if(!isset($_SESSION['userId']))
 		visibility: hidden;
 	}
 	.valid .status, #center.valid .status {
-		color: green;
+		color: #20FF20;
 		visibility: visible;
 	}
 	.invalid .status, #center.invalid .status, #center .status {
-		color: red;
+		color: #FF2020;
 		visibility: visible;
 	}
 	
diff --git a/code/serveur/php/ressources/backend.inc b/code/serveur/php/ressources/backend.inc
@@ -756,6 +756,6 @@ function getNodeEid($node) {
 function wordExist($node) {
 	$db = getDB();
 
-	return getNodeEid($node) === null ? true : false;
+	return getNodeEid($node) === null ? "0" : "1";
 }
 ?>
diff --git a/code/serveur/php/ressources/createGame.js b/code/serveur/php/ressources/createGame.js
@@ -109,7 +109,8 @@ $(function() {
 					url: "server.php?",
    					data: "action=4&word="+word+"&user="+user+"&passwd="+passwd,
    					success: function(msg){
-   						input.closest(".wordLine, #center").addClass((msg == false) ? "invalid" : "valid");
+						console.log(msg);
+   						input.closest(".wordLine, #center").addClass(msg == "false" ? "invalid" : "valid");
    						wordsOK[input.attr("id")] = !(msg == false);
     				}});
     		}
@@ -185,18 +186,19 @@ $(function() {
    		}
    		
    		$.get("server.php",{user:"foo",passwd:"bar",action:"6",game:exit},function (data) {
-   			$(".word").closest(".wordLine, #center").removeClass("valid invalid");
-				if(data === true) {
-					alert("Partie envoyée avec succès");
-				} else if (data === false) {
+   			//$(".word").closest(".wordLine, #center").removeClass("valid invalid");
+				if(data == "true") {
+					alert("Partie enregistrée avec succès");
+				} else if (data == "false") {
 					displayError("Le nuage doit contenir au moins "+nbWordMin+" mots valides.");
-				} else if (data !== true) {
+				} else if (data != "true") {
 					$('input').removeAttr('disabled');
 					var that = $(this);
 					$.each(data,function(i,e) {
 						$('.word')
 							.filter(function() { return that.val() == e; })
 							.closest(".wordLine, #center")
+							.removeClass("valid invalid")
 							.addClass("invalid");
 					});
 				}