Merge branch 'soon' into fileManagerMerge

This commit is contained in:
yflory
2016-12-07 16:59:32 +01:00
19 changed files with 569 additions and 69 deletions

View File

@@ -28,6 +28,7 @@ define([
var common = {
User: User,
Messages: Messages,
};
var store;
var fsStore;
@@ -238,6 +239,14 @@ define([
return secret;
};
var replaceHash = common.replaceHash = function (hash) {
if (window.history && window.history.replaceState) {
if (!/^#/.test(hash)) { hash = '#' + hash; }
return void window.history.replaceState({}, window.document.title, hash);
}
window.location.hash = hash;
};
var storageKey = common.storageKey = 'CryptPad_RECENTPADS';
/*