fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge HTMLDisplayHandler::_moveLinkToHeader() and _moveMetaToHeader(), and add special treatment for non-stylesheet <link> elements

Browse source
This commit is contained in:
Kijin Sung 2024-05-05 16:31:15 +09:00
parent b951d50841
commit 3cafc180b2
1 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

37
classes/display/HTMLDisplayHandler.php
View file

@ -243,14 +243,11 @@ class HTMLDisplayHandler
$start = microtime(true); $start = microtime(true);
// move <style ..></style> in body to the header // move <style>...</style> in body to the header
$output = preg_replace_callback('!<style(.*?)>(.*?)<\/style>!is', array($this, '_moveStyleToHeader'), $output); $output = preg_replace_callback('!<style(.*?)>(.*?)<\/style>!is', array($this, '_moveStyleToHeader'), $output);
// move <link ..></link> in body to the header // move <link> and <meta> in body to the header
$output = preg_replace_callback('!<link(.*?)/?>!is', array($this, '_moveLinkToHeader'), $output); $output = preg_replace_callback('!<(link|meta)\b(.*?)>!is', array($this, '_moveLinkToHeader'), $output);
// move <meta ../> in body to the header
$output = preg_replace_callback('!<meta(.*?)(?:\/|)>!is', array($this, '_moveMetaToHeader'), $output);
// change a meta fine(widget often put the tag like <!--Meta:path--> to the content because of caching) // change a meta fine(widget often put the tag like <!--Meta:path--> to the content because of caching)
$output = preg_replace_callback('/<!--(#)?Meta:([a-z0-9\_\-\/\.\@\:]+)(\?\$\_\_Context\-\>[a-z0-9\_\-\/\.\@\:\>]+)?-->/is', array($this, '_transMeta'), $output); $output = preg_replace_callback('/<!--(#)?Meta:([a-z0-9\_\-\/\.\@\:]+)(\?\$\_\_Context\-\>[a-z0-9\_\-\/\.\@\:\>]+)?-->/is', array($this, '_transMeta'), $output);
@ -396,8 +393,8 @@ class HTMLDisplayHandler
} }
/** /**
* add html style code extracted from html body to Context, which will be * Move <style> in the document body to the <head> section.
* printed inside <header></header> later. *
* @param array $matches * @param array $matches
* @return void * @return void
*/ */
@ -411,25 +408,21 @@ class HTMLDisplayHandler
} }
/** /**
* add html link code extracted from html body to Context, which will be * Move <link> and <meta> in the document body to the <head> section.
* printed inside <header></header> later. *
* @param array $matches * @param array $matches
* @return void * @return void
*/ */
function _moveLinkToHeader($matches) function _moveLinkToHeader($matches)
{ {
Context::addHtmlHeader($matches[0]); if ($matches[1] === 'link' && preg_match('/\brel="([^"]+)"/', $matches[2], $rel) && $rel[1] !== 'stylesheet' && preg_match('/\bhref="([^"]+)"/', $matches[2], $href))
} {
Context::addLink($href[1], $rel[1]);
/** }
* add meta code extracted from html body to Context, which will be else
* printed inside <header></header> later. {
* @param array $matches Context::addHtmlHeader($matches[0]);
* @return void }
*/
function _moveMetaToHeader($matches)
{
Context::addHtmlHeader($matches[0]);
} }
/** /**