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
2017-10-09 15:38:08 +02:00
parent 484e216054 a12239405b
commit 035150614d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
www/common/toolbar3.js
View File

@@ -657,9 +657,10 @@ define([
// We need to override the "a" tag action here because it is inside the iframe! // We need to override the "a" tag action here because it is inside the iframe!
var inDrive = /^\/drive/; var inDrive = /^\/drive/;
var origin = config.metadataMgr.getPrivateData().origin; var privateData = config.metadataMgr.getPrivateData();
var origin = privateData.origin;
var href = inDrive.test(origin) ? origin+'/index.html' : origin+'/drive/'; var pathname = privateData.pathname;
var href = inDrive.test(pathname) ? origin+'/index.html' : origin+'/drive/';
var buttonTitle = inDrive ? Messages.header_homeTitle : Messages.header_logoTitle; var buttonTitle = inDrive ? Messages.header_homeTitle : Messages.header_logoTitle;
var $aTag = $('<a>', { var $aTag = $('<a>', {