From 4457added27600de185298524635726781fe600e Mon Sep 17 00:00:00 2001 From: fatchan Date: Sat, 7 Mar 2020 15:54:48 +1100 Subject: [PATCH] greentext with quotes changes --- gulp/res/css/style.css | 5 +++++ gulp/res/js/themelist.js | 2 +- helpers/posting/markdown.js | 2 +- helpers/posting/quotes.js | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gulp/res/css/style.css b/gulp/res/css/style.css index a5b9cc60..7b849932 100644 --- a/gulp/res/css/style.css +++ b/gulp/res/css/style.css @@ -181,6 +181,11 @@ a, a:visited, a.post-name { color: var(--link-color); } +.invalid-quote { + cursor:pointer; + text-decoration: line-through; +} + .post-message a { text-decoration: underline; color: var(--post-link-color); diff --git a/gulp/res/js/themelist.js b/gulp/res/js/themelist.js index 18b23f35..bc68d799 100644 --- a/gulp/res/js/themelist.js +++ b/gulp/res/js/themelist.js @@ -1 +1 @@ -const themes = ['choc', 'clear', 'darkblue', 'lain', 'pink', 'tomorrow', 'yotsuba b', 'yotsuba', 'robot'];const codeThemes = ['a11y-dark', 'a11y-light', 'agate', 'an-old-hope', 'androidstudio', 'arduino-light', 'arta', 'ascetic', 'atelier-cave-dark', 'atelier-cave-light', 'atelier-dune-dark', 'atelier-dune-light', 'atelier-estuary-dark', 'atelier-estuary-light', 'atelier-forest-dark', 'atelier-forest-light', 'atelier-heath-dark', 'atelier-heath-light', 'atelier-lakeside-dark', 'atelier-lakeside-light', 'atelier-plateau-dark', 'atelier-plateau-light', 'atelier-savanna-dark', 'atelier-savanna-light', 'atelier-seaside-dark', 'atelier-seaside-light', 'atelier-sulphurpool-dark', 'atelier-sulphurpool-light', 'atom-one-dark-reasonable', 'atom-one-dark', 'atom-one-light', 'brown-paper', 'brown-papersq', 'codepen-embed', 'color-brewer', 'darcula', 'dark', 'darkula', 'default', 'docco', 'dracula', 'far', 'foundation', 'github-gist', 'github', 'gml', 'googlecode', 'gradient-dark', 'grayscale', 'gruvbox-dark', 'gruvbox-light', 'hopscotch', 'hybrid', 'idea', 'ir-black', 'isbl-editor-dark', 'isbl-editor-light', 'kimbie.dark', 'kimbie.light', 'lightfair', 'magula', 'mono-blue', 'monokai-sublime', 'monokai', 'night-owl', 'nord', 'obsidian', 'ocean', 'paraiso-dark', 'paraiso-light', 'pojoaque', 'pojoaque', 'purebasic', 'qtcreator_dark', 'qtcreator_light', 'railscasts', 'rainbow', 'routeros', 'school-book', 'school-book', 'shades-of-purple', 'solarized-dark', 'solarized-light', 'sunburst', 'tomorrow-night-blue', 'tomorrow-night-bright', 'tomorrow-night-eighties', 'tomorrow-night', 'tomorrow', 'vs', 'vs2015', 'xcode', 'xt256', 'zenburn']; \ No newline at end of file +const themes = ['clear', 'tomorrow', 'lain'];const codeThemes = ['a11y-dark', 'a11y-light', 'agate', 'an-old-hope', 'androidstudio', 'arduino-light', 'arta', 'ascetic', 'atelier-cave-dark', 'atelier-cave-light', 'atelier-dune-dark', 'atelier-dune-light', 'atelier-estuary-dark', 'atelier-estuary-light', 'atelier-forest-dark', 'atelier-forest-light', 'atelier-heath-dark', 'atelier-heath-light', 'atelier-lakeside-dark', 'atelier-lakeside-light', 'atelier-plateau-dark', 'atelier-plateau-light', 'atelier-savanna-dark', 'atelier-savanna-light', 'atelier-seaside-dark', 'atelier-seaside-light', 'atelier-sulphurpool-dark', 'atelier-sulphurpool-light', 'atom-one-dark-reasonable', 'atom-one-dark', 'atom-one-light', 'brown-paper', 'brown-papersq', 'codepen-embed', 'color-brewer', 'darcula', 'dark', 'darkula', 'default', 'docco', 'dracula', 'far', 'foundation', 'github-gist', 'github', 'gml', 'googlecode', 'gradient-dark', 'grayscale', 'gruvbox-dark', 'gruvbox-light', 'hopscotch', 'hybrid', 'idea', 'ir-black', 'isbl-editor-dark', 'isbl-editor-light', 'kimbie.dark', 'kimbie.light', 'lightfair', 'magula', 'mono-blue', 'monokai-sublime', 'monokai', 'night-owl', 'nord', 'obsidian', 'ocean', 'paraiso-dark', 'paraiso-light', 'pojoaque', 'pojoaque', 'purebasic', 'qtcreator_dark', 'qtcreator_light', 'railscasts', 'rainbow', 'routeros', 'school-book', 'school-book', 'shades-of-purple', 'solarized-dark', 'solarized-light', 'sunburst', 'tomorrow-night-blue', 'tomorrow-night-bright', 'tomorrow-night-eighties', 'tomorrow-night', 'tomorrow', 'vs', 'vs2015', 'xcode', 'xt256', 'zenburn']; \ No newline at end of file diff --git a/helpers/posting/markdown.js b/helpers/posting/markdown.js index 1bb3ba9e..50578bbc 100644 --- a/helpers/posting/markdown.js +++ b/helpers/posting/markdown.js @@ -1,6 +1,6 @@ 'use strict'; -const greentextRegex = /^>((?!>).+)/gm +const greentextRegex = /^>((?!>\d+|>>/\w+(/\d*)?).*)/gm , pinktextRegex = /^<(.+)/gm , boldRegex = /''(.+?)''/gm , titleRegex = /==(.+)==/gm diff --git a/helpers/posting/quotes.js b/helpers/posting/quotes.js index 35868c29..9252b95d 100644 --- a/helpers/posting/quotes.js +++ b/helpers/posting/quotes.js @@ -101,7 +101,7 @@ module.exports = async (board, text, thread) => { } return `>>${quotenum}${postThreadIdMap[board][quotenum].postId == thread ? ' (OP) ' : ''}`; } - return match; + return match;//`>>${quotenum}`; }); } if (crossQuotes) { @@ -113,7 +113,7 @@ module.exports = async (board, text, thread) => { return `>>>/${quoteboard}/`; } } - return match; + return match;// `>>>/${quoteboard}/`; }); }