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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
ansuz
2017-02-07 10:40:03 +01:00
parent 6f07a3b7b4 ac79fbb5a2
commit 8a1acc3c37
11 changed files with 257 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,7 +218,7 @@ define([
var patharr = window.location.hash.match(/[?&]path=([^&]+)/);
var namearr = window.location.hash.match(/[?&]name=([^&]+)/);
common.initialPath = patharr[1] || undefined;
common.initialName = namearr[1] ? decodeURIComponent(namearr[1]) : undefined;
common.initialName = namearr && namearr[1] ? decodeURIComponent(namearr[1]) : undefined;
window.location.hash = '';
}
if (!secretHash && !/#/.test(window.location.href)) {