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-08-28 12:22:38 +02:00
parent 6c65e5ff72 5fbbaee2f5
commit d4589c4699
15 changed files with 133 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
customize.dist/pages.js
View File

@@ -657,10 +657,6 @@ define([
return loadingScreen();
};
Pages['/contacts2/'] = Pages['/contacts2/index.html'] = function () {
return loadingScreen();
};
Pages['/pad/'] = Pages['/pad/index.html'] = function () {
return loadingScreen();
};

5
customize.dist/template.js
View File

@@ -9,7 +9,7 @@ define([
$(function () {
var $body = $('body');
var isMainApp = function () {
return /^\/(pad|code|slide|poll|whiteboard|file|media|contacts|contacts2|drive|settings|profile|todo)\/$/.test(location.pathname);
return /^\/(pad|code|slide|poll|whiteboard|file|media|contacts|drive|settings|profile|todo)\/$/.test(location.pathname);
};
var infoPage = function () {
@@ -55,9 +55,6 @@ $(function () {
} else if (/^\/contacts\/$/.test(pathname)) {
$('body').append(h('body', Pages[pathname]()).innerHTML);
require([ '/contacts/main.js' ], ready);
} else if (/contacts2/.test(pathname)) {
$('body').append(h('body', Pages[pathname]()).innerHTML);
require([ '/contacts2/main.js' ], ready);
} else if (/pad/.test(pathname)) {
$('body').append(h('body', Pages[pathname]()).innerHTML);
require([ '/pad/main.js' ], ready);