suzanne.soy/2011-m1s2-ter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yoann 2011-04-28 18:56:33 +02:00
commit a1e0e7ad3d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/serveur/php/ressources/pticlic.js
View File

@ -8,7 +8,7 @@ function State(init) {
var futureHashChange = null;
State.prototype.commit = function() {
try {
futureHashChange = "#"+encodeURI($.JSON.encode(this));
futureHashChange = "#"+encodeURI('"'+$.JSON.encode(this));
location.hash = futureHashChange;
return this;
} catch(e) {alert("Error State.prototype.commit");alert(e);}
@ -46,8 +46,10 @@ function hashchange() {
if (futureHashChange === location.hash) {
futureHashChange = null;
} else {
var stateJSON = decodeURI(location.hash.substring(location.hash.indexOf("#") + 1));
state = new State($.parseJSON(stateJSON)).validate();
var stateJSON = location.hash.substring(location.hash.indexOf("#") + 1);
if (stateJSON.charAt(0) != '"') { stateJSON = decodeURI(stateJSON); }
stateJSON = stateJSON.substring(1);
state = new State($.parseJSON(stateJSON || '{}')).validate();
}
} catch(e) {alert("Error hashchange");alert(e);}
}