commit 17b627febb170f0372032e328d32b26caaff05f8
parent 21c8c50e3ec21a690d44bde0523bc4c778e1774b
Author: Bertrand BRUN <bertrand0brun@gmail.com>
Date: Thu, 7 Apr 2011 16:05:10 +0200
reindentation du code en recherche d'un bug.
Diffstat:
1 file changed, 90 insertions(+), 92 deletions(-)
diff --git a/code/serveur/php/ressources/createGame.js b/code/serveur/php/ressources/createGame.js
@@ -1,104 +1,102 @@
-$($.getJSON("server.php",
- {action:"5", user:"foo", passwd:"bar"},
- function (data) {
- var numWord = 1;
- var user = "foo";
- var passwd = "bar";
- var relations = data;
- var nbWordMin = 10;
- var WordsOK = new Array();
- var centerOK = false;
-
-
- var displayNWordLines = function (nb) {
-
- for(var i=numWord; i<numWord+nb; i++){
- $("#templateWordLine")
- .clone()
- .find("label").attr("for", "word"+i).text(i).end()
- .find("input").attr("id", "word"+i).end()
- .appendTo("#wordLines");
+$(function() {
+ $.getJSON("server.php", {action:"5", user:"foo", passwd:"bar"}, function (data) {
+ var numWord = 1;
+ var user = "foo";
+ var passwd = "bar";
+ var relations = data;
+ var nbWordMin = 10;
+ var WordsOK = new Array();
+ var centerOK = false;
+
+
+ var displayNWordLines = function (nb) {
- (function (i) {
- $("#word"+i).focusout(checkWord);
- wordsOK[i] = false;
- })(i);
- }
+ for(var i=numWord; i<numWord+nb; i++){
+ $("#templateWordLine")
+ .clone()
+ .find("label").attr("for", "word"+i).text(i).end()
+ .find("input").attr("id", "word"+i).end()
+ .appendTo("#wordLines");
+
+ (function (i) {
+ $("#word"+i).focusout(checkWord);
+ wordsOK[i] = false;
+ })(i);
+ }
- numWord += nb;
- };
-
- var displayCentralWordAndRelations = function () {
- $("#centralWord").focusout(checkWord);
+ numWord += nb;
+ };
- $.each(relations,function(i,value){
- $('<option/>').val(i).text(value).appendTo("#relations select")
- });
- $("#relation1, #relation2").change(function(){
- if($("#relation1").val() == $("#relation2").val())
- displayError("Les relations doivent être différentes");
- else
- displayError("");
- });
- };
-
- var displayButtons = function () {
- $("#button").html('<input type="button" id="addLine" name="addLine" value="Ajouter" />');
- $("#addLine").click(function(){displayNWordLines(1)});
+ var displayCentralWordAndRelations = function() {
+ $("#centralWord").focusout(checkWord);
+
+ $.each(relations, function(i, value) {
+ $('<option/>').val(i).text(value).appendTo("#relations select");
+ });
+ $("#relation1, #relation2").change(function() {
+ if ($("#relation1").val() == $("#relation2").val())
+ displayError("Les relations doivent être différentes");
+ else
+ displayError("");
+ });
+ };
- $("#button").append('<input type="button" id="validate" name="validate" value="Valider" />');
- $("#validate").click(function(){formOK();});
- };
-
- var checkWord = function () {
- var input = $(this);
- var word = input.val();
+ var displayButtons = function () {
+ $("#button").html('<input type="button" id="addLine" name="addLine" value="Ajouter" />');
+ $("#addLine").click(function(){ displayNWordLines(1); });
+
+ $("#button").append('<input type="button" id="validate" name="validate" value="Valider" />');
+ $("#validate").click(function(){ formOK(); });
+ };
+
+ var checkWord = function () {
+ var input = $(this);
+ var word = input.val();
- input.parent(".wordLine, #center").removeClass("valid invalid");
+ input.parent(".wordLine, #center").removeClass("valid invalid");
- if (word != "") {
- $.ajax({type: "GET", url: "server.php?",
+ if (word != "") {
+ $.ajax({
+ type: "GET",
+ url: "server.php?",
data: "action=4&word="+word+"&user="+user+"&passwd="+passwd,
success: function(msg){
input.parent(".wordLine, #center").addClass((msg == false) ? "invalid" : "valid");
- wordsOK[input.val()] = msg == false ? false : true;
- }});
- }
- };
-
- var formOK = function(){
- displayError("");
+ wordsOK[input.val()] = !(msg == false);
+ }});
+ }
+ };
+
+ var formOK = function() {
+ displayError("");
- if($("#relation1").val() == $("#relation2").val())
- displayError("Les deux relation doivent être différents");
- else if($("#centralWord").val() == "")
- displayError("Le mot central doit être renseigné.");
- else if(nbWordOK() < nbWordMin)
- displayError("Le nuage doit contenir au moin "+nbWordMin+" mots valides.");
- };
-
- var nbWordOK = fucntion() {
- var count = 0;
+ if ($("#relation1").val() == $("#relation2").val())
+ displayError("Les deux relation doivent être différents");
+ else if ($("#centralWord").val() == "")
+ displayError("Le mot central doit être renseigné.");
+ else if (nbWordOK() < nbWordMin)
+ displayError("Le nuage doit contenir au moins "+nbWordMin+" mots valides.");
+ };
+
+ var nbWordOK = fucntion() {
+ var count = 0;
- foreach(word in wordsOK)
- if(word == true)
- count++;
-
- return count;
- };
+ for (word in wordsOK)
+ if (word == true)
+ count++;
+
+ return count;
+ };
- var displayError = function(message){
- if(message != ""){
- $("#errorDiv").text(message);
- $("#errorDiv").css("display","block");
- }
- else {
- $("#errorDiv").text("");
- $("#errorDiv").css("display","none");
- }
- };
-
- displayCentralWordAndRelations();
- displayNWordLines(10);
- displayButtons();
-}));
+ var displayError = function(message) {
+ if (message != "")
+ $("#errorDiv").text(message).show();
+ else
+ $("#errorDiv").hide();
+ };
+
+ displayCentralWordAndRelations();
+ displayNWordLines(10);
+ displayButtons();
+ });
+});