libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

Fixed document not accessible in iframe (#6642)

Browse source 
Co-authored-by: SamTv12345 <samtv12345@samtv12345.com>
This commit is contained in:
SamTV12345 2024-09-09 11:26:12 +02:00 committed by GitHub
parent 97dbe03e2e
commit a61f634586
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 68 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
pnpm-lock.yaml
View file

@ -240,8 +240,8 @@ importers:
specifier: 1.22.8 specifier: 1.22.8
version: 1.22.8 version: 1.22.8
rusty-store-kv: rusty-store-kv:
specifier: ^1.2.0 specifier: ^1.3.1
version: 1.2.0 version: 1.3.1
security: security:
specifier: 1.0.0 specifier: 1.0.0
version: 1.0.0 version: 1.0.0
@ -3954,68 +3954,68 @@ packages:
run-parallel@1.2.0: run-parallel@1.2.0:
resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
rusty-store-kv-darwin-arm64@1.2.0: rusty-store-kv-darwin-arm64@1.3.1:
resolution: {integrity: sha512-3kj/Sgs1WH+6edE8l7Db5+gpROpelYFX8PNloX0y6KzvUQgO1ZDs0Wa8kYG8MEDWIJlmw+7UcwpMmskMleU3Vw==} resolution: {integrity: sha512-xJ4kZh22AcNkbl5yIxUFPEZ5xtgOfAn9fH1rcLf0pUHJKTh3FsdrggBqNBlBlJRQ9RWw92MYBSC318mn8mH14Q==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
rusty-store-kv-darwin-x64@1.2.0: rusty-store-kv-darwin-x64@1.3.1:
resolution: {integrity: sha512-svSiGraZRukY6m330epEnJdu2D54JPzQfMjPRg8LT6f70MELGNxWRirnM/ACIBpWUfh1Ojm9jyK8OoY5IeI4UA==} resolution: {integrity: sha512-glm0uEKaetb6QBtfe5G7tsXA+tnkBCMDaxb3XCe9oCx3Pr7gR/we6OS9lPJHplaQPp10hGxOn7kjAqLVDlcT3w==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
rusty-store-kv-freebsd-x64@1.2.0: rusty-store-kv-freebsd-x64@1.3.1:
resolution: {integrity: sha512-h2/r4PKrRY92z2Ku5I5ACc8yaKdCma0rqak1l5ue/LsR6Zl2oXmzYKXJnzwrqCSIWDRrs5RG2TXMKuPO4telfw==} resolution: {integrity: sha512-LWUD+JFvrUlo34XfEsTf29EPsktxqqbGlUHAN/6q5DUjg/s5sBFB2W+C1xlwkD+BumyIkN60ZCRVIoXS2UgJjg==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [freebsd] os: [freebsd]
rusty-store-kv-linux-arm-gnueabihf@1.2.0: rusty-store-kv-linux-arm-gnueabihf@1.3.1:
resolution: {integrity: sha512-ivrCOriUYOc/nedCszyPHFATtnLaSaMfNM8h6Cjv4S0gzScpd9rOKVg2hrPh+zApzV/O3dvf6haDtLL1WViKUg==} resolution: {integrity: sha512-Stpor+kqRZg9ykYLjAJn0YrXfgH96WmTcS1AKeHs6gBhVMJ2RZmn1CyF06g5wVQ7sQGrZWMm8Hp3PGjhM5Z2Ew==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm] cpu: [arm]
os: [linux] os: [linux]
rusty-store-kv-linux-arm64-gnu@1.2.0: rusty-store-kv-linux-arm64-gnu@1.3.1:
resolution: {integrity: sha512-dZ3ZWsltagzP3U1J6WqWBRoIakqBP7i7y9MDBnKIFFYALVkvY2q2AhrN5cTBxZHaZTbrjyZyhE/rNbyqLZjXLg==} resolution: {integrity: sha512-ZorAn0AumVbL/6kqswhB/vnLEwlSBMvnhDF6LApHhFTRIygq63dyRrwtM8hgEqL/cjOMotGft6INn429V0RWcw==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
rusty-store-kv-linux-arm64-musl@1.2.0: rusty-store-kv-linux-arm64-musl@1.3.1:
resolution: {integrity: sha512-J0Zg+wYzy+03DTFZgMPiTaRTk8dfFJv7zQGpeGgeyma3k7SUmUYT2P1b+0NNjbVxr5xNdFJURyJVglUMP3SJRA==} resolution: {integrity: sha512-QMNbq7G1Zr2Yk82XqGbs7z2X2gs9mO5lxnHXeHLSy++56EUBTW/zj4JSjdYdetnFBkGwlPSQLAs1s0MXefxc0g==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
rusty-store-kv-linux-x64-gnu@1.2.0: rusty-store-kv-linux-x64-gnu@1.3.1:
resolution: {integrity: sha512-8EK6nzC4o13v7zOtLucoQcSOPSsJe9Rw1cAWk7F5qYg/lfFAQNzOpp68rkCBnrHix8yswcafzcSktJHTKuO4yA==} resolution: {integrity: sha512-aD6Oj3PlRzLLcIMytTdzkh/mIu0pJjsug2tA8Gfd5lH2SdB6NFVrF/cjrFWgx5LSLcmI+vVpstqjLOIuc3tZ7g==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
rusty-store-kv-linux-x64-musl@1.2.0: rusty-store-kv-linux-x64-musl@1.3.1:
resolution: {integrity: sha512-8Z6xAYWBFKfspSJ1XrRs8P5qYE/aDl6LGhX/5IXg/9mr54quH+pH6YXx88SD0lTgRh+mAD3brCNfr15fOKZftA==} resolution: {integrity: sha512-oSkE6X96muX0cbhE754s7shfzEzUTDQi5d3xrNlA/VskWRjDwKmrqiLHLsxO9lamNcDi5wvK8O6byI9qBXigRg==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
rusty-store-kv-win32-arm64-msvc@1.2.0: rusty-store-kv-win32-arm64-msvc@1.3.1:
resolution: {integrity: sha512-YmhUBOzJc6yj1Im/WXcD20iuaZ2GWANG/heTk09enzwgza8i68sSlA39TPTyLE0tOZFdbT76GEuIXPHB0peRRg==} resolution: {integrity: sha512-HIJ2uJt5LzI/Flx73gnZX/tUfOH2EKS1UKMEzzMF8kqor3iSeGyr0NkLxdl0sZ31dZzRkW63bKxTESmIYjTgiQ==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
rusty-store-kv-win32-x64-msvc@1.2.0: rusty-store-kv-win32-x64-msvc@1.3.1:
resolution: {integrity: sha512-z0/Snn9bZwsT9YnnG18Ol+pkLQpBHkAISq99NhbVdYj5lAYED/n2qIJpP1ROLJlFMJQ4PvftjCmAHUHy0tnkxA==} resolution: {integrity: sha512-CY1pmACrPg1mgfWPk7/dtB24TGc0RWv34+8Eg2lXbD6V7ePSMOVeVcIH7ra/JIjxbJJV2ljWvhkgUnEnp1FSKA==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
rusty-store-kv@1.2.0: rusty-store-kv@1.3.1:
resolution: {integrity: sha512-XlzClGSiIfOrpCUEh/eAAktFbsF4IPpDDeOEIP+cWmLkbVzWuqXVLIBouBH4ybKBlw+bQCyjOnZwBdyM9UVpUg==} resolution: {integrity: sha512-Kk+55VwQ5qLWcSD6R0RrxFOEF70SH7BjYj60MCskJvRkuY7MFlAPEn3hY4WzRodWXj5cCOJ4AsDr+4OvtaW/SQ==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
safe-array-concat@1.1.2: safe-array-concat@1.1.2:
@ -8638,48 +8638,48 @@ snapshots:
dependencies: dependencies:
queue-microtask: 1.2.3 queue-microtask: 1.2.3
rusty-store-kv-darwin-arm64@1.2.0: rusty-store-kv-darwin-arm64@1.3.1:
optional: true optional: true
rusty-store-kv-darwin-x64@1.2.0: rusty-store-kv-darwin-x64@1.3.1:
optional: true optional: true
rusty-store-kv-freebsd-x64@1.2.0: rusty-store-kv-freebsd-x64@1.3.1:
optional: true optional: true
rusty-store-kv-linux-arm-gnueabihf@1.2.0: rusty-store-kv-linux-arm-gnueabihf@1.3.1:
optional: true optional: true
rusty-store-kv-linux-arm64-gnu@1.2.0: rusty-store-kv-linux-arm64-gnu@1.3.1:
optional: true optional: true
rusty-store-kv-linux-arm64-musl@1.2.0: rusty-store-kv-linux-arm64-musl@1.3.1:
optional: true optional: true
rusty-store-kv-linux-x64-gnu@1.2.0: rusty-store-kv-linux-x64-gnu@1.3.1:
optional: true optional: true
rusty-store-kv-linux-x64-musl@1.2.0: rusty-store-kv-linux-x64-musl@1.3.1:
optional: true optional: true
rusty-store-kv-win32-arm64-msvc@1.2.0: rusty-store-kv-win32-arm64-msvc@1.3.1:
optional: true optional: true
rusty-store-kv-win32-x64-msvc@1.2.0: rusty-store-kv-win32-x64-msvc@1.3.1:
optional: true optional: true
rusty-store-kv@1.2.0: rusty-store-kv@1.3.1:
optionalDependencies: optionalDependencies:
rusty-store-kv-darwin-arm64: 1.2.0 rusty-store-kv-darwin-arm64: 1.3.1
rusty-store-kv-darwin-x64: 1.2.0 rusty-store-kv-darwin-x64: 1.3.1
rusty-store-kv-freebsd-x64: 1.2.0 rusty-store-kv-freebsd-x64: 1.3.1
rusty-store-kv-linux-arm-gnueabihf: 1.2.0 rusty-store-kv-linux-arm-gnueabihf: 1.3.1
rusty-store-kv-linux-arm64-gnu: 1.2.0 rusty-store-kv-linux-arm64-gnu: 1.3.1
rusty-store-kv-linux-arm64-musl: 1.2.0 rusty-store-kv-linux-arm64-musl: 1.3.1
rusty-store-kv-linux-x64-gnu: 1.2.0 rusty-store-kv-linux-x64-gnu: 1.3.1
rusty-store-kv-linux-x64-musl: 1.2.0 rusty-store-kv-linux-x64-musl: 1.3.1
rusty-store-kv-win32-arm64-msvc: 1.2.0 rusty-store-kv-win32-arm64-msvc: 1.3.1
rusty-store-kv-win32-x64-msvc: 1.2.0 rusty-store-kv-win32-x64-msvc: 1.3.1
safe-array-concat@1.1.2: safe-array-concat@1.1.2:
dependencies: dependencies:

2
src/package.json
View file

@ -74,7 +74,7 @@
"underscore": "1.13.7", "underscore": "1.13.7",
"unorm": "1.6.0", "unorm": "1.6.0",
"wtfnode": "^0.9.3", "wtfnode": "^0.9.3",
"rusty-store-kv": "^1.2.0" "rusty-store-kv": "^1.3.1"
}, },
"bin": { "bin": {
"etherpad-healthcheck": "../bin/etherpad-healthcheck", "etherpad-healthcheck": "../bin/etherpad-healthcheck",

36
src/static/js/ace2_inner.ts
View file

@ -167,7 +167,7 @@ function Ace2Inner(editorInfo, cssManagers) {
for (const name of names) console[name] = noop; for (const name of names) console[name] = noop;
} }
const scheduler = parent; // hack for opera required const scheduler = window; // hack for opera required
const performDocumentReplaceRange = (start, end, newText) => { const performDocumentReplaceRange = (start, end, newText) => {
if (start === undefined) start = rep.selStart; if (start === undefined) start = rep.selStart;
@ -240,7 +240,7 @@ function Ace2Inner(editorInfo, cssManagers) {
bgcolor = fadeColor(bgcolor, info.fade); bgcolor = fadeColor(bgcolor, info.fade);
} }
const textColor = const textColor =
colorutils.textColorFromBackgroundColor(bgcolor, parent.parent.clientVars.skinName); colorutils.textColorFromBackgroundColor(bgcolor, window.clientVars.skinName);
const styles = [ const styles = [
cssManagers.inner.selectorStyle(authorSelector), cssManagers.inner.selectorStyle(authorSelector),
cssManagers.parent.selectorStyle(authorSelector), cssManagers.parent.selectorStyle(authorSelector),
@ -1270,7 +1270,7 @@ function Ace2Inner(editorInfo, cssManagers) {
const prevLine = rep.lines.prev(thisLine); const prevLine = rep.lines.prev(thisLine);
const prevLineText = prevLine.text; const prevLineText = prevLine.text;
let theIndent = /^ *(?:)/.exec(prevLineText)[0]; let theIndent = /^ *(?:)/.exec(prevLineText)[0];
const shouldIndent = parent.parent.clientVars.indentationOnNewLine; const shouldIndent = window.clientVars.indentationOnNewLine;
if (shouldIndent && /[[(:{]\s*$/.exec(prevLineText)) { if (shouldIndent && /[[(:{]\s*$/.exec(prevLineText)) {
theIndent += THE_TAB; theIndent += THE_TAB;
} }
@ -2023,7 +2023,7 @@ function Ace2Inner(editorInfo, cssManagers) {
const isPadLoading = (t) => t === 'setup' || t === 'setBaseText' || t === 'importText'; const isPadLoading = (t) => t === 'setup' || t === 'setBaseText' || t === 'importText';
const updateStyleButtonState = (attribName, hasStyleOnRepSelection) => { const updateStyleButtonState = (attribName, hasStyleOnRepSelection) => {
const $formattingButton = parent.parent.$(`[data-key="${attribName}"]`).find('a'); const $formattingButton = window.$(`[data-key="${attribName}"]`).find('a');
$formattingButton.toggleClass(SELECT_BUTTON_CLASS, hasStyleOnRepSelection); $formattingButton.toggleClass(SELECT_BUTTON_CLASS, hasStyleOnRepSelection);
}; };
@ -2277,7 +2277,7 @@ function Ace2Inner(editorInfo, cssManagers) {
}; };
const hideEditBarDropdowns = () => { const hideEditBarDropdowns = () => {
window.parent.parent.padeditbar.toggleDropDown('none'); window.padeditbar.toggleDropDown('none');
}; };
const renumberList = (lineNum) => { const renumberList = (lineNum) => {
@ -2582,7 +2582,7 @@ function Ace2Inner(editorInfo, cssManagers) {
specialHandled = specialHandledInHook.indexOf(true) !== -1; specialHandled = specialHandledInHook.indexOf(true) !== -1;
} }
const padShortcutEnabled = parent.parent.clientVars.padShortcutEnabled; const padShortcutEnabled = window.clientVars.padShortcutEnabled;
if (!specialHandled && isTypeForSpecialKey && if (!specialHandled && isTypeForSpecialKey &&
altKey && keyCode === 120 && altKey && keyCode === 120 &&
padShortcutEnabled.altF9) { padShortcutEnabled.altF9) {
@ -2591,7 +2591,7 @@ function Ace2Inner(editorInfo, cssManagers) {
// As ubuntu cannot use Alt F10.... // As ubuntu cannot use Alt F10....
// Focus on the editbar. // Focus on the editbar.
// -- TODO: Move Focus back to previous state (we know it so we can use it) // -- TODO: Move Focus back to previous state (we know it so we can use it)
const firstEditbarElement = parent.parent.$('#editbar') const firstEditbarElement = window.$('#editbar')
.children('ul').first().children().first() .children('ul').first().children().first()
.children().first().children().first(); .children().first().children().first();
$(this).trigger('blur'); $(this).trigger('blur');
@ -2603,8 +2603,8 @@ function Ace2Inner(editorInfo, cssManagers) {
padShortcutEnabled.altC) { padShortcutEnabled.altC) {
// Alt c focuses on the Chat window // Alt c focuses on the Chat window
$(this).trigger('blur'); $(this).trigger('blur');
parent.parent.chat.show(); window.chat.show();
parent.parent.$('#chatinput').trigger('focus'); window.$('#chatinput').trigger('focus');
evt.preventDefault(); evt.preventDefault();
} }
if (!specialHandled && type === 'keydown' && if (!specialHandled && type === 'keydown' &&
@ -2626,12 +2626,12 @@ function Ace2Inner(editorInfo, cssManagers) {
if (authorId) authorIds.add(authorId); if (authorId) authorIds.add(authorId);
} }
} }
const idToName = new Map(parent.parent.pad.userList().map((a) => [a.userId, a.name])); const idToName = new Map(window.pad.userList().map((a) => [a.userId, a.name]));
const myId = parent.parent.clientVars.userId; const myId = window.clientVars.userId;
const authors = const authors =
[...authorIds].map((id) => id === myId ? 'me' : idToName.get(id) || 'unknown'); [...authorIds].map((id) => id === myId ? 'me' : idToName.get(id) || 'unknown');
parent.parent.$.gritter.add({ window.$.gritter.add({
title: 'Line Authors', title: 'Line Authors',
text: text:
authors.length === 0 ? 'No author information is available' authors.length === 0 ? 'No author information is available'
@ -2680,7 +2680,7 @@ function Ace2Inner(editorInfo, cssManagers) {
specialHandled = true; specialHandled = true;
// close all gritters when the user hits escape key // close all gritters when the user hits escape key
parent.parent.$.gritter.removeAll(); window.$.gritter.removeAll();
} }
if (!specialHandled && isTypeForCmdKey && if (!specialHandled && isTypeForCmdKey &&
/* Do a saved revision on ctrl S */ /* Do a saved revision on ctrl S */
@ -2688,13 +2688,13 @@ function Ace2Inner(editorInfo, cssManagers) {
!evt.altKey && !evt.altKey &&
padShortcutEnabled.cmdS) { padShortcutEnabled.cmdS) {
evt.preventDefault(); evt.preventDefault();
const originalBackground = parent.parent.$('#revisionlink').css('background'); const originalBackground = window.$('#revisionlink').css('background');
parent.parent.$('#revisionlink').css({background: 'lightyellow'}); window.$('#revisionlink').css({background: 'lightyellow'});
scheduler.setTimeout(() => { scheduler.setTimeout(() => {
parent.parent.$('#revisionlink').css({background: originalBackground}); window.$('#revisionlink').css({background: originalBackground});
}, 1000); }, 1000);
/* The parent.parent part of this is BAD and I feel bad.. It may break something */
parent.parent.pad.collabClient.sendMessage({type: 'SAVE_REVISION'}); window.pad.collabClient.sendMessage({type: 'SAVE_REVISION'});
specialHandled = true; specialHandled = true;
} }
if (!specialHandled && isTypeForSpecialKey && if (!specialHandled && isTypeForSpecialKey &&

2
src/static/js/changesettracker.ts
View file

@ -140,7 +140,7 @@ const makeChangesetTracker = (scheduler, apool, aceCallbacksProvider) => {
toSubmit = compose(submittedChangeset, userChangeset, apool); toSubmit = compose(submittedChangeset, userChangeset, apool);
} else { } else {
// Get my authorID // Get my authorID
const authorId = parent.parent.pad.myUserInfo.userId; const authorId = window.pad.myUserInfo.userId;
// Sanitize authorship: Replace all author attributes with this user's author ID in case the // Sanitize authorship: Replace all author attributes with this user's author ID in case the
// text was copied from another author. // text was copied from another author.

5
src/static/js/scroll.ts
View file

@ -15,7 +15,8 @@ class Scroll {
// DOM reference // DOM reference
this.outerWin = outerWin; this.outerWin = outerWin;
this.doc = this.outerWin.contentDocument!; this.doc = this.outerWin.contentDocument!;
this.rootDocument = parent.parent.document; this.rootDocument = document;
console.log(this.rootDocument)
} }
scrollWhenCaretIsInTheLastLineOfViewportWhenNecessary(rep: RepModel, isScrollableEvent: boolean, innerHeight: number) { scrollWhenCaretIsInTheLastLineOfViewportWhenNecessary(rep: RepModel, isScrollableEvent: boolean, innerHeight: number) {
@ -112,7 +113,7 @@ class Scroll {
}; };
_getEditorPositionTop() { _getEditorPositionTop() {
const editor = parent.document.getElementsByTagName('iframe'); const editor = document.getElementsByTagName('iframe');
const editorPositionTop = editor[0].offsetTop; const editorPositionTop = editor[0].offsetTop;
return editorPositionTop; return editorPositionTop;
}; };