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

resolve merge conflicts in template.js

Browse Source
This commit is contained in:
ansuz 2017-06-27 14:28:28 +02:00
commit 3a9b480e4e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
customize.dist/pages.js
View File

@ -285,6 +285,10 @@ define([
return h('div#container'); return h('div#container');
}; };
Pages['/profile/'] = Pages['/profile/index.html'] = function () {
return h('div#container');
};
Pages['/register/'] = Pages['/register/index.html'] = function () { Pages['/register/'] = Pages['/register/index.html'] = function () {
return [h('div#main', [ return [h('div#main', [
h('div.mainOverlay'), h('div.mainOverlay'),

3
customize.dist/template.js
View File

@ -136,6 +136,8 @@ $(function () {
if (/^\/settings\//.test(pathname)) { if (/^\/settings\//.test(pathname)) {
require([ '/settings/main.js', ], function () {}); require([ '/settings/main.js', ], function () {});
} else if (/^\/profile\//.test(pathname)) {
require([ '/profile/main.js'], function () {});
} else if (/^\/user\//.test(pathname)) { } else if (/^\/user\//.test(pathname)) {
require([ '/user/main.js'], function () {}); require([ '/user/main.js'], function () {});
} else if (/^\/register\//.test(pathname)) { } else if (/^\/register\//.test(pathname)) {
@ -149,6 +151,5 @@ $(function () {
require([ '/customize/main.js', ], function () {}); require([ '/customize/main.js', ], function () {});
} }
}); });
}); });
}); });