web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use replaceState if available, instead of setting the hash

Browse Source
This commit is contained in:
ansuz 2016-11-07 11:20:30 +01:00
parent 67bf41627d
commit 303c65f2c3
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/code/main.js
View File

@ -495,9 +495,7 @@ define([
} }
// set the hash // set the hash
if (!readOnly) { if (!readOnly) { Cryptpad.setHash(editHash); }
window.location.hash = editHash;
}
Cryptpad.getPadTitle(function (err, title) { Cryptpad.getPadTitle(function (err, title) {
if (err) { if (err) {

8
www/common/cryptpad-common.js
View File

@ -225,6 +225,14 @@ define([
return secret; return secret;
}; };
var setHash = common.setHash = function (hash) {
if (!/^#/.test(hash)) { hash = '#' + hash; }
if (window.history && window.history.replaceState) {
return void window.history.replaceState({}, window.document.title, hash);
}
window.location.hash = hash;
};
var storageKey = common.storageKey = 'CryptPad_RECENTPADS'; var storageKey = common.storageKey = 'CryptPad_RECENTPADS';
/* /*

4
www/pad/main.js
View File

@ -601,9 +601,7 @@ define([
} }
// set the hash // set the hash
if (!readOnly) { if (!readOnly) { Cryptpad.setHash(editHash); }
window.location.hash = editHash;
}
Cryptpad.getPadTitle(function (err, title) { Cryptpad.getPadTitle(function (err, title) {
if (err) { if (err) {

4
www/poll/main.js
View File

@ -914,9 +914,7 @@ define([
editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys); editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
} }
// set the hash // set the hash
if (!readOnly) { if (!readOnly) { Cryptpad.setHash(editHash); }
window.location.hash = editHash;
}
module.patchText = TextPatcher.create({ module.patchText = TextPatcher.create({
realtime: realtime, realtime: realtime,

2
www/slide/main.js
View File

@ -585,7 +585,7 @@ define([
// set the hash // set the hash
if (!window.location.hash || window.location.hash === '#') { if (!window.location.hash || window.location.hash === '#') {
window.location.hash = editHash; Cryptpad.setHash(editHash);
} }
Cryptpad.getPadTitle(function (err, title) { Cryptpad.getPadTitle(function (err, title) {