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:
yflory 2019-10-01 11:57:42 +02:00
commit 3a8b3ea6cd
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/support/main.js
View File

@ -4,8 +4,10 @@ define([
'/api/config', '/api/config',
'/common/dom-ready.js', '/common/dom-ready.js',
'/common/requireconfig.js', '/common/requireconfig.js',
'/common/sframe-common-outer.js' '/common/sframe-common-outer.js',
], function (nThen, ApiConfig, DomReady, RequireConfig, SFCommonO) { '/common/outer/local-store.js',
'/common/outer/login-block.js',
], function (nThen, ApiConfig, DomReady, RequireConfig, SFCommonO, LocalStore, Block) {
var requireConfig = RequireConfig(); var requireConfig = RequireConfig();
// Loaded in load #2 // Loaded in load #2
@ -43,6 +45,12 @@ define([
} }
var addData = function (obj) { var addData = function (obj) {
if (category) { obj.category = category; } if (category) { obj.category = category; }
var hash = LocalStore.getBlockHash();
if (!hash) { return; }
var parsed = Block.parseBlockHash(hash);
if (!parsed || !parsed.href) { return; }
obj.blockLocation = parsed.href;
}; };
SFCommonO.start({ SFCommonO.start({
noRealtime: true, noRealtime: true,

1
www/support/ui.js
View File

@ -24,6 +24,7 @@ define([
curvePublic: user.curvePublic, curvePublic: user.curvePublic,
edPublic: privateData.edPublic, edPublic: privateData.edPublic,
notifications: user.notifications, notifications: user.notifications,
blockLocation: privateData.blockLocation || '',
}; };
if (typeof(ctx.pinUsage) === 'object') { if (typeof(ctx.pinUsage) === 'object') {