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

minor anti-xss changes...

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-08-24 13:53:42 +02:00
parent 75fde58846
commit 7bbea28831
6 changed files with 765 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
www/pad2/main.js
View File

@@ -117,13 +117,6 @@ define([
'AUDIO'
];
var openLink = function (e) {
var el = e.currentTarget;
if (!el || el.nodeName !== 'A') { return; }
var href = el.getAttribute('href');
if (href) { window.open(href, '_blank'); }
};
var getHTML = function (inner) {
return ('<!DOCTYPE html>\n' + '<html>\n' + inner.innerHTML);
};
@@ -303,12 +296,21 @@ define([
el.setAttribute('class', 'non-realtime');
});
var documentBody = $html.find('iframe')[0].contentWindow.document.body;
var ifrWindow = $html.find('iframe')[0].contentWindow;
var documentBody = ifrWindow.document.body;
var inner = window.inner = documentBody;
var cursor = module.cursor = Cursor(inner);
var openLink = function (e) {
var el = e.currentTarget;
if (!el || el.nodeName !== 'A') { return; }
var href = el.getAttribute('href');
if (href) { ifrWindow.open(href, '_blank'); }
};
var setEditable = module.setEditable = function (bool) {
if (bool) {
$(inner).css({
@@ -733,7 +735,10 @@ define([
var common;
nThen(function (waitFor) {
ckEditorAvailable(waitFor(function (ck) { Ckeditor = ck; }));
ckEditorAvailable(waitFor(function (ck) {
Ckeditor = ck;
require(['/pad2/wysiwygarea-plugin.js'], waitFor());
}));
$(waitFor(function () {
Cryptpad.addLoadingScreen();
}));