') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Allow variable tags to contain malformed xml by ang-zeyu · Pull Request #1193 · MarkBind/markbind · GitHub
Skip to content

Allow variable tags to contain malformed xml - #1193

Merged
ang-zeyu merged 1 commit into
MarkBind:masterfrom
ang-zeyu:fix-variable-tags
Apr 12, 2020
Merged

Allow variable tags to contain malformed xml#1193
ang-zeyu merged 1 commit into
MarkBind:masterfrom
ang-zeyu:fix-variable-tags

Conversation

@ang-zeyu

@ang-zeyuang-zeyu commented Apr 11, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

What is the purpose of this pull request? (put "X" next to an item, remove the rest)

• [x] Bug fix

Fixes the first point mentioned here #1168 (comment)

What is the rationale for this request?
Simple patch to allow <variable> tags to hold any content built on #1047

Is there anything you'd like reviewers to focus on?
na

Testing instructions:
npm run test should pass

Proposed commit message: (wrap lines at 72 characters)
Allow variable tags to contain malformed xml

With the special tags patch, variables are able to contain custom
content possibly containing malformed xml.

Let’s add variable to the list of special tags to do so.

@ang-zeyu
Allow variable tags to contain malformed xml
bd7d999
With the special tags patch, variables are able to contain custom
content possibly containing malformed xml.
Let’s add variable to the list of special tags to do so.
@ang-zeyuang-zeyu mentioned this pull request Apr 11, 2020
Merged
@nbriannl

nbriannl commented Apr 12, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

Thanks for this fix. Would anything regress now that variables can contain malformed xml? I don't see any reason why anything would regress. Test seem fine, update tests seem ok too.

marvinchin
marvinchin approved these changes Apr 12, 2020
View reviewed changes

@marvinchinmarvinchin left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ang-zeyu

ang-zeyu commented Apr 12, 2020

Copy link
Copy Markdown
ContributorAuthor

Thanks for this fix. Would anything regress now that variables can contain malformed xml? I don't see any reason why anything would regress. Test seem fine, update tests seem ok too.

Yup, 2103 site had no diffs either. If anything it should fix edge cases of variables currently in use that had slightly incompatible syntax

@ang-zeyuang-zeyu added this to the v2.13.2 milestone Apr 12, 2020
@ang-zeyu
ang-zeyu merged commit bdc4b0c into MarkBind:masterApr 12, 2020
@damithc

damithc commented Apr 16, 2020

Copy link
Copy Markdown
Contributor

@ang-zeyu should we update the user guide somewhere to reflect this enhancement?

@ang-zeyu

ang-zeyu commented Apr 16, 2020

Copy link
Copy Markdown
ContributorAuthor

@ang-zeyu should we update the user guide somewhere to reflect this enhancement?

Will do, didn't notice this limitation was documented

@ang-zeyuang-zeyu mentioned this pull request Apr 16, 2020
Merged
@damithc

damithc commented Apr 18, 2020

Copy link
Copy Markdown
Contributor

Tested in production. Good work @ang-zeyu and reviewers.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@marvinchinmarvinchinmarvinchin approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

v2.14.0

Development

Successfully merging this pull request may close these issues.

4 participants

@ang-zeyu@nbriannl@damithc@marvinchin