diff --git a/code/serveur/php/jeu.html b/code/serveur/php/jeu.html
index 210c481..1a51637 100644
--- a/code/serveur/php/jeu.html
+++ b/code/serveur/php/jeu.html
@@ -47,6 +47,7 @@ body {
+
diff --git a/code/serveur/php/ressources/jquery.JSON.js b/code/serveur/php/ressources/jquery.JSON.js
new file mode 100644
index 0000000..19c1af3
--- /dev/null
+++ b/code/serveur/php/ressources/jquery.JSON.js
@@ -0,0 +1,178 @@
+/*
+ * This document is licensed as free software under the terms of the
+ * MIT License: http://www.opensource.org/licenses/mit-license.php
+ *
+ * Adapted by Rahul Singla.
+ *
+ * Brantley Harris wrote this plugin. It is based somewhat on the JSON.org
+ * website's http://www.json.org/json2.js, which proclaims:
+ * "NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.", a sentiment that
+ * I uphold.
+ *
+ * It is also influenced heavily by MochiKit's serializeJSON, which is
+ * copyrighted 2005 by Bob Ippolito.
+ */
+
+/**
+ * jQuery.JSON.encode( json-serializble ) Converts the given argument into a
+ * JSON respresentation.
+ *
+ * If an object has a "toJSON" function, that will be used to get the
+ * representation. Non-integer/string keys are skipped in the object, as are
+ * keys that point to a function.
+ *
+ * json-serializble: The *thing* to be converted.
+ */
+jQuery.JSON = {
+ encode: function(o) {
+ if (typeof (JSON) == 'object' && JSON.stringify)
+ return JSON.stringify(o);
+
+ var type = typeof (o);
+
+ if (o === null)
+ return "null";
+
+ if (type == "undefined")
+ return undefined;
+
+ if (type == "number" || type == "boolean")
+ return o + "";
+
+ if (type == "string")
+ return this.quoteString(o);
+
+ if (type == 'object') {
+ if (typeof o.toJSON == "function")
+ return this.encode(o.toJSON());
+
+ if (o.constructor === Date) {
+ var month = o.getUTCMonth() + 1;
+ if (month < 10)
+ month = '0' + month;
+
+ var day = o.getUTCDate();
+ if (day < 10)
+ day = '0' + day;
+
+ var year = o.getUTCFullYear();
+
+ var hours = o.getUTCHours();
+ if (hours < 10)
+ hours = '0' + hours;
+
+ var minutes = o.getUTCMinutes();
+ if (minutes < 10)
+ minutes = '0' + minutes;
+
+ var seconds = o.getUTCSeconds();
+ if (seconds < 10)
+ seconds = '0' + seconds;
+
+ var milli = o.getUTCMilliseconds();
+ if (milli < 100)
+ milli = '0' + milli;
+ if (milli < 10)
+ milli = '0' + milli;
+
+ return '"' + year + '-' + month + '-' + day + 'T' + hours + ':'
+ + minutes + ':' + seconds + '.' + milli + 'Z"';
+ }
+
+ if (o.constructor === Array) {
+ var ret = [];
+ for ( var i = 0; i < o.length; i++)
+ ret.push(this.encode(o[i]) || "null");
+
+ return "[" + ret.join(",") + "]";
+ }
+
+ var pairs = [];
+ for ( var k in o) {
+ var name;
+ var type = typeof k;
+
+ if (type == "number")
+ name = '"' + k + '"';
+ else if (type == "string")
+ name = this.quoteString(k);
+ else
+ continue; // skip non-string or number keys
+
+ if (typeof o[k] == "function")
+ continue; // skip pairs where the value is a function.
+
+ var val = this.encode(o[k]);
+
+ pairs.push(name + ":" + val);
+ }
+
+ return "{" + pairs.join(", ") + "}";
+ }
+ },
+
+ /**
+ * jQuery.JSON.decode(src) Evaluates a given piece of json source.
+ */
+ decode: function(src) {
+ if (typeof (JSON) == 'object' && JSON.parse)
+ return JSON.parse(src);
+ return eval("(" + src + ")");
+ },
+
+ /**
+ * jQuery.JSON.decodeSecure(src) Evals JSON in a way that is *more* secure.
+ */
+ decodeSecure: function(src) {
+ if (typeof (JSON) == 'object' && JSON.parse)
+ return JSON.parse(src);
+
+ var filtered = src;
+ filtered = filtered.replace(/\\["\\\/bfnrtu]/g, '@');
+ filtered = filtered
+ .replace(
+ /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+ ']');
+ filtered = filtered.replace(/(?:^|:|,)(?:\s*\[)+/g, '');
+
+ if (/^[\],:{}\s]*$/.test(filtered))
+ return eval("(" + src + ")");
+ else
+ throw new SyntaxError("Error parsing JSON, source is not valid.");
+ },
+
+ /**
+ * jQuery.JSON.quoteString(string) Returns a string-repr of a string, escaping
+ * quotes intelligently. Mostly a support function for JSON.encode.
+ *
+ * Examples: >>> jQuery.JSON.quoteString("apple") "apple"
+ *
+ * >>> jQuery.JSON.quoteString('"Where are we going?", she asked.') "\"Where
+ * are we going?\", she asked."
+ */
+ quoteString: function(string) {
+ if (string.match(this._escapeable)) {
+ return '"' + string.replace(this._escapeable, function(a) {
+ var c = this._meta[a];
+ if (typeof c === 'string')
+ return c;
+ c = a.charCodeAt();
+ return '\\u00' + Math.floor(c / 16).toString(16)
+ + (c % 16).toString(16);
+ }) + '"';
+ }
+ return '"' + string + '"';
+ },
+
+ _escapeable: /["\\\x00-\x1f\x7f-\x9f]/g,
+
+ _meta: {
+ '\b': '\\b',
+ '\t': '\\t',
+ '\n': '\\n',
+ '\f': '\\f',
+ '\r': '\\r',
+ '"': '\\"',
+ '\\': '\\\\'
+ }
+}
diff --git a/code/serveur/php/ressources/jquery.JSON.js.url b/code/serveur/php/ressources/jquery.JSON.js.url
new file mode 100644
index 0000000..8452e94
--- /dev/null
+++ b/code/serveur/php/ressources/jquery.JSON.js.url
@@ -0,0 +1 @@
+http://www.rahulsingla.com/blog/2010/05/jquery-encode-decode-arbitrary-objects-to-and-from-json
diff --git a/code/serveur/php/ressources/pticlic.js b/code/serveur/php/ressources/pticlic.js
index b75cf55..2aecf79 100644
--- a/code/serveur/php/ressources/pticlic.js
+++ b/code/serveur/php/ressources/pticlic.js
@@ -1,6 +1,6 @@
var state = "frontpage";
-// ==== JavaScript Style général
+// ==== JavaScript Style général
function jss() {
var w = $(window).width();
var h = $(window).height();
@@ -99,10 +99,34 @@ jss.score = function(w, h, iconSize) {
};
// ==== URL persistante
+oldhash = {};
function hashchange() {
- var info = location.hash.substring(location.hash.indexOf("#") + 1).split("/");;
- screen[info[0]]();
-};
+ if(oldhash && typeof(oldhash.state) == 'string' && leave[oldhash.state]) leave[oldhash.state]();
+ oldhash = hash();
+ var h = hash();
+ if (enter[h.state]) enter[h.state]();
+}
+
+function state() {
+ var info = $.JSON.decode(location.hash.substring(location.hash.indexOf("#") + 1).split(","));
+ info.get = function (key) {
+ return this[key];
+ };
+ info.set = function(key, value) {
+ this[key] = value;
+ };
+ info.commit = function () {
+ var info = this;
+ delete info.get;
+ delete info.commit;
+ delete info.set;
+ location.hash="#"+$.JSON.encode(info);
+ };
+ return info;
+}
+
+enter = {};
+leave = {};
// ==== Interface Android
var UI = {
@@ -117,7 +141,7 @@ if (typeof(PtiClicAndroid) != "undefined") {
UI = PtiClicAndroid;
}
-// ==== Code métier général
+// ==== Code métier général
$(function() {
$(window).resize(jss);
$(window).hashchange(hashchange);
@@ -127,13 +151,12 @@ $(function() {
function ajaxError(x) {
UI.dismiss();
- alert("Erreur fatale. Merci de nous envoyer ce message : "+x.status+" - "+x.statusText+"\n"+x.responseText.substring(0,20)+((x.responseText == '') ? '': '…'));
+ alert("Erreur fatale. Merci de nous envoyer ce message : "+x.status+" - "+x.statusText+"\n"+x.responseText.substring(0,20)+((x.responseText == '') ? '': 'âò Š'));
}
-// ==== Code métier pour la frontpage
-screen = {};
+// ==== Code métier pour la frontpage
ui = {};
-screen.frontpage = function () {
+enter.frontpage = function () {
state="frontpage";
$("#frontpage .frontpage-button.game").click(function(){
location.hash = "#game";
@@ -142,10 +165,10 @@ screen.frontpage = function () {
UI.dismiss();
}
-// ==== Code métier pour le jeu
-screen.game = function () {
+// ==== Code métier pour le jeu
+enter.game = function () {
state="game";
- UI.show("PtiClic", "Récupération de la partie");
+ UI.show("PtiClic", "Récupération de la partie");
$.getJSON("getGame.php?callback=?", {
user:"foo",
passwd:"bar",
@@ -154,6 +177,11 @@ screen.game = function () {
jss();
}
+leave.game = function () {
+ $("#game .relations").empty();
+ $('#game #mn-caption').stop().clearQueue();
+}
+
ui.game = function (game) {
var currentWordNb = 0;
game.answers = [];
@@ -169,9 +197,7 @@ ui.game = function (game) {
if (currentWordNb < game.cloud.length) {
animateNext(click, button);
} else {
- $("#game .relations").empty();
- $('#game #mn-caption').stop().clearQueue();
- ui.score(game);
+ location.hash = "#score";
}
}
@@ -186,7 +212,7 @@ ui.game = function (game) {
.stop() // Attention : stop() et clearQueue() ont aussi un effet
.clearQueue() // sur la 2e utilisation de mn (ci-dessous).
.clone()
- .removeClass("mn") // Pour que le texte animé ne soit pas modifié.
+ .removeClass("mn") // Pour que le texte animé ne soit pas modifié.
.appendTo("body") // Append to body so we can animate the offset (instead of top/left).
.offset(mn.offset())
.animate({left:click.left, top:click.top, fontSize: 0}, duration)
@@ -221,9 +247,9 @@ ui.game = function (game) {
UI.dismiss();
}
-// ==== Code métier pour les scores
-screen.score = function (game) {
- state="score";
+// ==== Code métier pour les scores
+enter.score = function () {
+ var game = state.getGame();
UI.show("PtiClic", "Calcul de votre score");
$.getJSON("server.php?callback=?", {
user: "foo",
@@ -261,4 +287,4 @@ ui.score = function (game) {
jss();
});
UI.dismiss();
-}
\ No newline at end of file
+}