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

set correct hash even if browser does not implement replaceState

Browse Source
This commit is contained in:
ansuz 2016-11-07 15:03:17 +01:00
parent 303c65f2c3
commit c2770a7a74
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/code/main.js
View File

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

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

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

2
www/pad/main.js
View File

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

2
www/poll/main.js
View File

@ -914,7 +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) { Cryptpad.setHash(editHash); } if (!readOnly) { Cryptpad.replaceHash(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 === '#') {
Cryptpad.setHash(editHash); Cryptpad.replaceHash(editHash);
} }
Cryptpad.getPadTitle(function (err, title) { Cryptpad.getPadTitle(function (err, title) {