From cdce88484443acdbf4b5f1660e9bd945cc788c67 Mon Sep 17 00:00:00 2001 From: Greyhoof <132987288+greyhoof@users.noreply.github.com> Date: Tue, 10 Oct 2023 10:07:29 +0200 Subject: [PATCH 01/10] x Fixed openURLExternally() encoding URLs that were already encoded --- electron/main.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/electron/main.ts b/electron/main.ts index 253ca39..48ff691 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -177,8 +177,16 @@ function openURLExternally(linkUrl: string): void { if(settings.browserPath !== '' && fs.existsSync(settings.browserPath) && fs.lstatSync(settings.browserPath).isFile()) { - // encode URL so if it contains spaces, it remains a single argument for the browser - linkUrl = encodeURI(linkUrl); + + // check if URL is already encoded + // (this should work almost all the time, but there might be edge-cases with very unusual URLs) + let isEncoded = (linkUrl !== decodeURI(linkUrl)); + // only encode URL if it isn't encoded yet + if(!isEncoded) { + // encode URL so if it contains spaces, it remains a single argument for the browser + linkUrl = encodeURI(linkUrl); + } + if(!settings.browserArgs.includes('%s')) { // append %s to params if it is not already there From 877bb9448f49b7de9e060692ca1c01b4f552bb2b Mon Sep 17 00:00:00 2001 From: Greyhoof <132987288+greyhoof@users.noreply.github.com> Date: Tue, 10 Oct 2023 10:24:17 +0200 Subject: [PATCH 02/10] x Potential fix for selecting executables as external browser on Mac and Linux --- electron/main.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/electron/main.ts b/electron/main.ts index 48ff691..7b613ef 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -744,11 +744,24 @@ function onReady(): void { electron.ipcMain.handle('browser-option-browse', async () => { log.debug('settings.browserOption.browse'); console.log('settings.browserOption.browse', JSON.stringify(settings)); + + const os = require('os'); + let filters; + if(os.platform() === "win32") { + filters = [{ name: 'Executables', extensions: ['exe'] }]; + } else if (os.platform() === "darwin") { + filters = [{ name: 'Executables', extensions: ['app'] }]; + } else { + // linux and anything else that might be supported + // no specific extension for executables + filters = [{ name: 'Executables', extensions: ['*'] }]; + } + const dir = electron.dialog.showOpenDialogSync( { defaultPath: settings.browserPath, properties: ['openFile'], - filters: [{ name: 'Executables', extensions: ['exe'] }] + filters: filters }); if(dir !== undefined) { return dir[0]; From bfcbf8573ba61335ec89cf35f40ca8cd9c7c3b15 Mon Sep 17 00:00:00 2001 From: Greyhoof <132987288+greyhoof@users.noreply.github.com> Date: Tue, 10 Oct 2023 11:54:09 +0200 Subject: [PATCH 03/10] [x] Fixed opening URLs in external browser on MacOS --- electron/main.ts | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/electron/main.ts b/electron/main.ts index 7b613ef..30b892a 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -173,11 +173,22 @@ async function addSpellcheckerItems(menu: electron.Menu): Promise { } function openURLExternally(linkUrl: string): void { - // check if user set a path, whether it exists and if it is a file - if(settings.browserPath !== '' && - fs.existsSync(settings.browserPath) && - fs.lstatSync(settings.browserPath).isFile()) { + // console.log('openURLExternally()', JSON.stringify(settings)); + // console.log('openURLExternally() -> path set?', settings.browserPath !== ''); + // console.log('openURLExternally() -> path exists?', fs.existsSync(settings.browserPath)); + // console.log('openURLExternally() -> path points to file?', fs.lstatSync(settings.browserPath).isFile()); + const os = require('os'); + // check if user set a path, whether it exists and if it is a file or an .app path + let isValid = (settings.browserPath !== '' && fs.existsSync(settings.browserPath)); + if (os.platform() === "darwin") { + // is there a better way for this on macos? + isValid = (isValid && settings.browserPath.endsWith('.app')); + } else { + isValid = (isValid && fs.lstatSync(settings.browserPath).isFile()); + } + + if(isValid) { // check if URL is already encoded // (this should work almost all the time, but there might be edge-cases with very unusual URLs) let isEncoded = (linkUrl !== decodeURI(linkUrl)); @@ -197,7 +208,15 @@ function openURLExternally(linkUrl: string): void { let link = settings.browserArgs.replace('%s', '\"'+linkUrl+'\"'); const execFile = require('child_process').exec; - execFile(`"${settings.browserPath}" ${link}`); + if (os.platform() === "darwin") { + // NOTE: This is seemingly bugged on MacOS when setting Safari as the external browser while using a different default browser. + // In that case, this will open the URL in both the selected application AND the default browser. + // Other browsers work fine. (Tested with Chrome with Firefox as the default browser.) + // https://developer.apple.com/forums/thread/685385 + execFile(`open -a "${settings.browserPath}" ${link}`); + } else { + execFile(`"${settings.browserPath}" ${link}`); + } } else { electron.shell.openExternal(linkUrl); } From 8ba7326b48e2c302ed58d5eac4a5d9f298f59735 Mon Sep 17 00:00:00 2001 From: Greyhoof <132987288+greyhoof@users.noreply.github.com> Date: Wed, 11 Oct 2023 09:42:59 +0200 Subject: [PATCH 04/10] ~ Removed os import, using process.platform instead --- electron/main.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/electron/main.ts b/electron/main.ts index 30b892a..d5fe096 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -178,10 +178,9 @@ function openURLExternally(linkUrl: string): void { // console.log('openURLExternally() -> path exists?', fs.existsSync(settings.browserPath)); // console.log('openURLExternally() -> path points to file?', fs.lstatSync(settings.browserPath).isFile()); - const os = require('os'); // check if user set a path, whether it exists and if it is a file or an .app path let isValid = (settings.browserPath !== '' && fs.existsSync(settings.browserPath)); - if (os.platform() === "darwin") { + if (process.platform === "darwin") { // is there a better way for this on macos? isValid = (isValid && settings.browserPath.endsWith('.app')); } else { @@ -208,7 +207,7 @@ function openURLExternally(linkUrl: string): void { let link = settings.browserArgs.replace('%s', '\"'+linkUrl+'\"'); const execFile = require('child_process').exec; - if (os.platform() === "darwin") { + if (process.platform === "darwin") { // NOTE: This is seemingly bugged on MacOS when setting Safari as the external browser while using a different default browser. // In that case, this will open the URL in both the selected application AND the default browser. // Other browsers work fine. (Tested with Chrome with Firefox as the default browser.) @@ -764,11 +763,10 @@ function onReady(): void { log.debug('settings.browserOption.browse'); console.log('settings.browserOption.browse', JSON.stringify(settings)); - const os = require('os'); let filters; - if(os.platform() === "win32") { + if(process.platform === "win32") { filters = [{ name: 'Executables', extensions: ['exe'] }]; - } else if (os.platform() === "darwin") { + } else if (process.platform === "darwin") { filters = [{ name: 'Executables', extensions: ['app'] }]; } else { // linux and anything else that might be supported From 040c1ca21d1b73eb24063bfb66a55d98becc0d7b Mon Sep 17 00:00:00 2001 From: Greyhoof <132987288+greyhoof@users.noreply.github.com> Date: Wed, 11 Oct 2023 10:16:58 +0200 Subject: [PATCH 05/10] + Added a warning re: browser setting + Added a mac-specific warning about an unresolved bug in MacOS ~ Adjusted settings window dimensions --- electron/BrowserOption.vue | 26 ++++++++++++++++++++++++++ electron/main.ts | 17 +++++++++++------ 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/electron/BrowserOption.vue b/electron/BrowserOption.vue index eae71f1..b8f0525 100644 --- a/electron/BrowserOption.vue +++ b/electron/BrowserOption.vue @@ -16,6 +16,21 @@

{{l('settings.browserOptionTitle')}}

+
+
+
+
+
Danger Zone!
+
This is an advanced setting. By changing this setting to an unsupported program (e.g. not a browser), you might not be able to open links from F-Chat anymore.
+ +
+

Mac User: As of writing, MacOS has a bug in how it handles opening links.

+

When your default browser is something other than Safari and you select Safari in this settings window, links might be opened twice.

+

Once in Safari and a second time in your default browser. This tends to happen when Safari is not running when clicking a link.

+
+
+
+
@@ -83,6 +98,7 @@ export default class BrowserOption extends Vue { hasCompletedUpgrades = false; browserPath = ''; browserArgs = ''; + isMac = process.platform === 'darwin'; get styling(): string { try { @@ -197,6 +213,16 @@ export default class BrowserOption extends Vue { } } + .warning { + border: 1px solid var(--warning); + padding: 10px; + margin-bottom: 20px; + border-radius: 3px; + + div { + margin-top: 10px; + } + } .disableWindowsHighContrast, .disableWindowsHighContrast * { forced-color-adjust: none; diff --git a/electron/main.ts b/electron/main.ts index d5fe096..262b027 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -341,17 +341,22 @@ function showPatchNotes(): void { } function openBrowserSettings(): electron.BrowserWindow | undefined { + let desiredHeight = 500; + if(process.platform === 'darwin') { + desiredHeight = 750; + } + const windowProperties: electron.BrowserWindowConstructorOptions = { center: true, show: false, icon: process.platform === 'win32' ? winIcon : pngIcon, frame: false, - width: 500, - height: 350, - minWidth: 500, - minHeight: 368, - maxWidth: 500, - maxHeight: 368, + width: 650, + height: desiredHeight, + minWidth: 650, + minHeight: desiredHeight, + maxWidth: 650, + maxHeight: desiredHeight, maximizable: false, webPreferences: { webviewTag: true, nodeIntegration: true, nodeIntegrationInWorker: true, spellcheck: true, From acb03878083d15b7667b938a9aaff6803879df86 Mon Sep 17 00:00:00 2001 From: Greyhoof <132987288+greyhoof@users.noreply.github.com> Date: Thu, 12 Oct 2023 14:15:22 +0200 Subject: [PATCH 06/10] [~] OpenURLExternally() now just checks if the path exists and is executable by user --- electron/main.ts | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/electron/main.ts b/electron/main.ts index 262b027..6d39d2b 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -177,15 +177,43 @@ function openURLExternally(linkUrl: string): void { // console.log('openURLExternally() -> path set?', settings.browserPath !== ''); // console.log('openURLExternally() -> path exists?', fs.existsSync(settings.browserPath)); // console.log('openURLExternally() -> path points to file?', fs.lstatSync(settings.browserPath).isFile()); + // console.log('openURLExternally() -> path points to directory?', fs.lstatSync(settings.browserPath).isDirectory()); + + try { + fs.accessSync(settings.browserPath, fs.constants.X_OK); + console.log('can exec'); + } catch (err) { + console.error('cannot exec'); + } // check if user set a path, whether it exists and if it is a file or an .app path let isValid = (settings.browserPath !== '' && fs.existsSync(settings.browserPath)); - if (process.platform === "darwin") { - // is there a better way for this on macos? - isValid = (isValid && settings.browserPath.endsWith('.app')); - } else { - isValid = (isValid && fs.lstatSync(settings.browserPath).isFile()); + // if (process.platform === "darwin") { + // // is there a better way for this on macos? + // isValid = (isValid && settings.browserPath.endsWith('.app')); + // } else if (process.platform === "linux") { + // // isFile() doesn't like symlinks, so we check if the user can execute the selected path + // let canExec = false; + // try { + // fs.accessSync(settings.browserPath, fs.constants.X_OK); + // canExec = true; + // } catch (err) { + // log.error("Selected browser cannot is not executable by user."); + // } + // isValid = (isValid && canExec); + // } else { + // isValid = (isValid && fs.lstatSync(settings.browserPath).isFile()); + // } + + // we check if the user can execute whatever is located at the selected path + let canExec = false; + try { + fs.accessSync(settings.browserPath, fs.constants.X_OK); + canExec = true; + } catch (err) { + log.error("Selected browser cannot is not executable by user."); } + isValid = (isValid && canExec); if(isValid) { // check if URL is already encoded From 1b9401cbfa7f9d69288c9758ed1c353d86c15c52 Mon Sep 17 00:00:00 2001 From: Greyhoof <132987288+greyhoof@users.noreply.github.com> Date: Thu, 12 Oct 2023 14:41:04 +0200 Subject: [PATCH 07/10] ~ Refactored logic for checking browser path and access --- electron/main.ts | 108 ++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 67 deletions(-) diff --git a/electron/main.ts b/electron/main.ts index 6d39d2b..49e6238 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -173,80 +173,54 @@ async function addSpellcheckerItems(menu: electron.Menu): Promise { } function openURLExternally(linkUrl: string): void { - // console.log('openURLExternally()', JSON.stringify(settings)); - // console.log('openURLExternally() -> path set?', settings.browserPath !== ''); - // console.log('openURLExternally() -> path exists?', fs.existsSync(settings.browserPath)); - // console.log('openURLExternally() -> path points to file?', fs.lstatSync(settings.browserPath).isFile()); - // console.log('openURLExternally() -> path points to directory?', fs.lstatSync(settings.browserPath).isDirectory()); - try { - fs.accessSync(settings.browserPath, fs.constants.X_OK); - console.log('can exec'); - } catch (err) { - console.error('cannot exec'); - } + // check if user set a path and whether it exists + const pathIsValid = (settings.browserPath !== '' && fs.existsSync(settings.browserPath)); - // check if user set a path, whether it exists and if it is a file or an .app path - let isValid = (settings.browserPath !== '' && fs.existsSync(settings.browserPath)); - // if (process.platform === "darwin") { - // // is there a better way for this on macos? - // isValid = (isValid && settings.browserPath.endsWith('.app')); - // } else if (process.platform === "linux") { - // // isFile() doesn't like symlinks, so we check if the user can execute the selected path - // let canExec = false; - // try { - // fs.accessSync(settings.browserPath, fs.constants.X_OK); - // canExec = true; - // } catch (err) { - // log.error("Selected browser cannot is not executable by user."); - // } - // isValid = (isValid && canExec); - // } else { - // isValid = (isValid && fs.lstatSync(settings.browserPath).isFile()); - // } - - // we check if the user can execute whatever is located at the selected path - let canExec = false; - try { - fs.accessSync(settings.browserPath, fs.constants.X_OK); - canExec = true; - } catch (err) { - log.error("Selected browser cannot is not executable by user."); - } - isValid = (isValid && canExec); - - if(isValid) { - // check if URL is already encoded - // (this should work almost all the time, but there might be edge-cases with very unusual URLs) - let isEncoded = (linkUrl !== decodeURI(linkUrl)); - // only encode URL if it isn't encoded yet - if(!isEncoded) { - // encode URL so if it contains spaces, it remains a single argument for the browser - linkUrl = encodeURI(linkUrl); + if(pathIsValid) { + // also check if the user can execute whatever is located at the selected path + let fileIsExecutable = false; + try { + fs.accessSync(settings.browserPath, fs.constants.X_OK); + fileIsExecutable = true; + } catch (err) { + log.error(`Selected browser is not executable by user. Path: "${settings.browserPath}"`); } + if (fileIsExecutable) { + // check if URL is already encoded + // (this should work almost all the time, but there might be edge-cases with very unusual URLs) + let isEncoded = (linkUrl !== decodeURI(linkUrl)); + // only encode URL if it isn't encoded yet + if (!isEncoded) { + // encode URL so if it contains spaces, it remains a single argument for the browser + linkUrl = encodeURI(linkUrl); + } - if(!settings.browserArgs.includes('%s')) { - // append %s to params if it is not already there - settings.browserArgs += ' %s'; + + if (!settings.browserArgs.includes('%s')) { + // append %s to params if it is not already there + settings.browserArgs += ' %s'; + } + + // replace %s in arguments with URL and encapsulate in quotes to prevent issues with spaces and special characters in the path + let link = settings.browserArgs.replace('%s', '\"' + linkUrl + '\"'); + + const execFile = require('child_process').exec; + if (process.platform === "darwin") { + // NOTE: This is seemingly bugged on MacOS when setting Safari as the external browser while using a different default browser. + // In that case, this will open the URL in both the selected application AND the default browser. + // Other browsers work fine. (Tested with Chrome with Firefox as the default browser.) + // https://developer.apple.com/forums/thread/685385 + execFile(`open -a "${settings.browserPath}" ${link}`); + } else { + execFile(`"${settings.browserPath}" ${link}`); + } + return; } - - // replace %s in arguments with URL and encapsulate in quotes to prevent issues with spaces and special characters in the path - let link = settings.browserArgs.replace('%s', '\"'+linkUrl+'\"'); - - const execFile = require('child_process').exec; - if (process.platform === "darwin") { - // NOTE: This is seemingly bugged on MacOS when setting Safari as the external browser while using a different default browser. - // In that case, this will open the URL in both the selected application AND the default browser. - // Other browsers work fine. (Tested with Chrome with Firefox as the default browser.) - // https://developer.apple.com/forums/thread/685385 - execFile(`open -a "${settings.browserPath}" ${link}`); - } else { - execFile(`"${settings.browserPath}" ${link}`); - } - } else { - electron.shell.openExternal(linkUrl); } + + electron.shell.openExternal(linkUrl); } function setUpWebContents(webContents: electron.WebContents): void { From b29b43de75875c57182e740c2b4a0c3860cd741a Mon Sep 17 00:00:00 2001 From: Greyhoof <132987288+greyhoof@users.noreply.github.com> Date: Fri, 17 Nov 2023 09:33:58 +0100 Subject: [PATCH 08/10] + Added a "reset to default" button for browser settings --- chat/localize.ts | 1 + electron/BrowserOption.vue | 15 ++++++++++++--- electron/main.ts | 3 +-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/chat/localize.ts b/chat/localize.ts index baa905e..ea8fb63 100644 --- a/chat/localize.ts +++ b/chat/localize.ts @@ -197,6 +197,7 @@ Current log location: {1}`, 'settings.browserOptionArgumentsHelp': 'Arguments are separated by spaces. Use %s to insert the URL.', 'settings.browserOptionBrowse': 'Browse', 'settings.browserOptionSave': 'Save', + 'settings.browserOptionReset': 'Reset to default', 'fixLogs.action': 'Fix corrupted logs', 'fixLogs.text': `There are a few reason log files can become corrupted - log files from old versions with bugs that have since been fixed or incomplete file operations caused by computer crashes are the most common. If one of your log files is corrupted, you may get an "Unknown Type" error when you log in or when you open a specific tab. You may also experience other issues. diff --git a/electron/BrowserOption.vue b/electron/BrowserOption.vue index b8f0525..5913c2b 100644 --- a/electron/BrowserOption.vue +++ b/electron/BrowserOption.vue @@ -21,7 +21,7 @@
Danger Zone!
-
This is an advanced setting. By changing this setting to an unsupported program (e.g. not a browser), you might not be able to open links from F-Chat anymore.
+
This is an advanced setting. By changing this setting to an unsupported program (i.e. not a browser), you might not be able to open links from F-Chat anymore.

Mac User: As of writing, MacOS has a bug in how it handles opening links.

@@ -56,9 +56,13 @@
-
+
- + +
+
+
+
@@ -160,6 +164,11 @@ export default class BrowserOption extends Vue { this.close(); } + resetToDefault(): void { + this.browserPath = ''; + this.browserArgs = ''; + } + browseForPath(): void { ipcRenderer.invoke('browser-option-browse').then((result) => { this.browserPath = result; diff --git a/electron/main.ts b/electron/main.ts index 49e6238..0377a0e 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -197,7 +197,6 @@ function openURLExternally(linkUrl: string): void { linkUrl = encodeURI(linkUrl); } - if (!settings.browserArgs.includes('%s')) { // append %s to params if it is not already there settings.browserArgs += ' %s'; @@ -343,7 +342,7 @@ function showPatchNotes(): void { } function openBrowserSettings(): electron.BrowserWindow | undefined { - let desiredHeight = 500; + let desiredHeight = 520; if(process.platform === 'darwin') { desiredHeight = 750; } From d072d4a3811c943645016fd437aad2ab2ea6119e Mon Sep 17 00:00:00 2001 From: Abeehiltz Date: Sun, 19 Nov 2023 12:02:20 +0100 Subject: [PATCH 09/10] Fix [hr] in collapse title --- bbcode/parser.ts | 32 ++++++++++++++++++++++++++++---- bbcode/standard.ts | 6 +++++- site/utils.ts | 10 ++++++++++ 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/bbcode/parser.ts b/bbcode/parser.ts index 7983ec3..c5e026b 100644 --- a/bbcode/parser.ts +++ b/bbcode/parser.ts @@ -127,7 +127,10 @@ export class BBCodeParser { isAllowed = (name) => self.isAllowed(name) && parentAllowed(name); currentTag = this._currentTag = {tag: self.tag, line: this._line, column: this._column}; } - let tagStart = -1, paramStart = -1, mark = start; + let tagStart = -1, + paramStart = -1, + mark = start, + isInCollapseParam = false; for(let i = start; i < input.length; ++i) { const c = input[i]; ++this._column; @@ -135,12 +138,22 @@ export class BBCodeParser { ++this._line; this._column = 1; } - if(c === '[') { + if(c === '[' && !isInCollapseParam) { tagStart = i; paramStart = -1; - } else if(c === '=' && paramStart === -1) - paramStart = i; + } else if(c === '=' && paramStart === -1) { + paramStart = i; + + const paramIndex = paramStart === -1 ? i : paramStart; + let tagKey = input + .substring(tagStart + 1, paramIndex) + .trim() + .toLowerCase(); + + if (tagKey == "collapse") isInCollapseParam = true; + } else if(c === ']') { + const paramIndex = paramStart === -1 ? i : paramStart; let tagKey = input.substring(tagStart + 1, paramIndex).trim().toLowerCase(); if(tagKey.length === 0) { @@ -154,6 +167,17 @@ export class BBCodeParser { tagStart = -1; continue; } + if (isInCollapseParam) { + let fullTagKey = input + .substring(tagStart + 1, i + 1) + .trim() + .toLowerCase(); + if (fullTagKey.endsWith("[hr]")) { + continue; + } + } + + isInCollapseParam = false; if(!close) { const tag = this._tags[tagKey]!; const allowed = isAllowed(tagKey); diff --git a/bbcode/standard.ts b/bbcode/standard.ts index 80f851b..1d677d9 100644 --- a/bbcode/standard.ts +++ b/bbcode/standard.ts @@ -73,7 +73,11 @@ export class StandardBBCodeParser extends CoreBBCodeParser { icon.className = 'fas fa-chevron-down'; icon.style.marginRight = '10px'; headerText.appendChild(icon); - headerText.appendChild(document.createTextNode(param)); + // HACK: to allow [hr] in header part + param = Utils.replaceAll(param, "[hr]", "
"); + const headerText2 = parser.createElement("div"); + headerText2.innerHTML = param; + headerText.appendChild(headerText2); outer.appendChild(headerText); const body = parser.createElement('div'); body.className = 'bbcode-collapse-body'; diff --git a/site/utils.ts b/site/utils.ts index bf4d313..11975ab 100644 --- a/site/utils.ts +++ b/site/utils.ts @@ -82,3 +82,13 @@ export function init(s: Settings, c: SimpleCharacter[]): void { settings = s; characters = c; } + +function escapeRegExp(string: string): +string { + return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string +} + +export function replaceAll(str: string, find: string, replace: string): +string { + return str.replace(new RegExp(escapeRegExp(find), "g"), replace); +} \ No newline at end of file From 912b8e07aef8cdc6618312f6b6983c70a4fd743c Mon Sep 17 00:00:00 2001 From: Abeehiltz Date: Sun, 19 Nov 2023 21:58:06 +0100 Subject: [PATCH 10/10] Place the arrow correctly in-between [hr] --- bbcode/standard.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/bbcode/standard.ts b/bbcode/standard.ts index 1d677d9..b32e4df 100644 --- a/bbcode/standard.ts +++ b/bbcode/standard.ts @@ -72,12 +72,15 @@ export class StandardBBCodeParser extends CoreBBCodeParser { const icon = parser.createElement('i'); icon.className = 'fas fa-chevron-down'; icon.style.marginRight = '10px'; - headerText.appendChild(icon); // HACK: to allow [hr] in header part - param = Utils.replaceAll(param, "[hr]", "
"); - const headerText2 = parser.createElement("div"); - headerText2.innerHTML = param; - headerText.appendChild(headerText2); + if (param.startsWith('[hr]')) { headerText.appendChild(parser.createElement('hr')); param = param.slice(4) } + headerText.appendChild(icon); + const splitParam = param.split('[hr]') + for (let iii = 0; iii < splitParam.length; iii++) { + const element = splitParam[iii]; + headerText.appendChild(document.createTextNode(element)); + if (iii < splitParam.length-1) headerText.appendChild(parser.createElement('hr')) + } outer.appendChild(headerText); const body = parser.createElement('div'); body.className = 'bbcode-collapse-body';