tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

doc/lib: Remove DocSearchRenderer::highlight() 

refs #6630
This commit is contained in:
Eric Lippmann 2015-02-11 13:16:14 +01:00
parent ab78757483
commit 512eb3fe83
1 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modules/doc/library/Doc/Search/DocSearchRenderer.php
View File

@ -15,13 +15,6 @@ use Icinga\Module\Doc\Renderer;
*/ */
class DocSearchRenderer extends Renderer class DocSearchRenderer extends Renderer
{ {
/**
* CSS class
*
* @type string
*/
const HIGHLIGHT_CSS_CLASS = 'search-highlight';
/** /**
* The content to render * The content to render
* *
@ -44,7 +37,7 @@ class DocSearchRenderer extends Renderer
*/ */
public function beginIteration() public function beginIteration()
{ {
$this->content[] = '<nav><ul>'; $this->content[] = '<nav role="navigation"><ul class="toc">';
} }
/** /**
@ -61,7 +54,7 @@ class DocSearchRenderer extends Renderer
public function beginChildren() public function beginChildren()
{ {
if ($this->getInnerIterator()->getMatches()) { if ($this->getInnerIterator()->getMatches()) {
$this->content[] = '<ul>'; $this->content[] = '<ul class="toc">';
} }
} }
@ -75,22 +68,6 @@ class DocSearchRenderer extends Renderer
} }
} }
public function highlight($line, array $matches)
{
$highlighted = '';
$offset = 0;
ksort($matches);
foreach ($matches as $position => $match) {
$highlighted .= $this->getView()->escape(substr($line, $offset, $position - $offset))
. '<span class="' . static::HIGHLIGHT_CSS_CLASS .'">'
. $this->getView()->escape($match)
. '</span>';
$offset = $position + strlen($match);
}
$highlighted .= $this->getView()->escape(substr($line, $offset));
return $highlighted;
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
@ -104,17 +81,17 @@ class DocSearchRenderer extends Renderer
$contentMatches = array(); $contentMatches = array();
foreach ($matches as $match) { foreach ($matches as $match) {
if ($match->getMatchType() === DocSearchMatch::MATCH_HEADER) { if ($match->getMatchType() === DocSearchMatch::MATCH_HEADER) {
$title = $this->highlight($match->getLine(), $match->getMatches()); $title = $match->highlight();
} else { } else {
$contentMatches[] = sprintf( $contentMatches[] = sprintf(
'<p>%s</p>', '<p>%s</p>',
$this->highlight($match->getLine(), $match->getMatches()) $match->highlight()
); );
} }
} }
$path = $this->getView()->getHelper('Url')->url( $path = $this->getView()->getHelper('Url')->url(
array_merge( array_merge(
$this->urlParams, $this->getUrlParams(),
array( array(
'chapter' => $this->encodeUrlParam($section->getChapter()->getId()) 'chapter' => $this->encodeUrlParam($section->getChapter()->getId())
) )
@ -125,7 +102,7 @@ class DocSearchRenderer extends Renderer
); );
$url = $this->getView()->url( $url = $this->getView()->url(
$path, $path,
array('highlight' => $this->getInnerIterator()->getSearch()->getInput()) array('highlight-search' => $this->getInnerIterator()->getSearch()->getInput())
); );
/** @type \Icinga\Web\Url $url */ /** @type \Icinga\Web\Url $url */
$url->setAnchor($this->encodeAnchor($section->getId())); $url->setAnchor($this->encodeAnchor($section->getId()));