Framework/Mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Capture whitespace before tags, prefix it to partials.

Browse Source
This commit is contained in:
Justin Hileman
2010-11-24 08:11:09 -05:00
parent 3e6b8102b7
commit 2b8e2f6e84
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+13 -6
View File
@@ -441,7 +441,7 @@ class Mustache {
protected function _prepareTagRegex($otag, $ctag) { protected function _prepareTagRegex($otag, $ctag) {
return sprintf( return sprintf(
'/(?:(?<=\\n)[ \\t]*)?%s(?<type>[%s]?)(?<tag_name>.+?)(?:\\1|})?%s(?:\\s*(?=\\n))?/s', '/(?<whitespace>(?<=\\n)[ \\t]*)?%s(?<type>[%s]?)(?<tag_name>.+?)(?:\\2|})?%s(?:\\s*(?=\\n))?/s',
preg_quote($otag, '/'), preg_quote($otag, '/'),
preg_quote(self::TAG_TYPES, '/'), preg_quote(self::TAG_TYPES, '/'),
preg_quote($ctag, '/') preg_quote($ctag, '/')
@@ -473,6 +473,12 @@ class Mustache {
$modifier = $matches['type'][0]; $modifier = $matches['type'][0];
$tag_name = trim($matches['tag_name'][0]); $tag_name = trim($matches['tag_name'][0]);
if (isset($matches['whitespace']) && $matches['whitespace'][1] > -1) {
$whitespace = $matches['whitespace'][0];
} else {
$whitespace = null;
}
$html .= substr($template, 0, $offset); $html .= substr($template, 0, $offset);
$next_offset = $offset + strlen($tag); $next_offset = $offset + strlen($tag);
@@ -481,7 +487,7 @@ class Mustache {
} }
$template = substr($template, $next_offset); $template = substr($template, $next_offset);
$html .= $this->_renderTag($modifier, $tag_name); $html .= $this->_renderTag($modifier, $tag_name, $whitespace);
} }
$this->_otag = $otag_orig; $this->_otag = $otag_orig;
@@ -502,7 +508,7 @@ class Mustache {
* @throws MustacheException Unmatched section tag encountered. * @throws MustacheException Unmatched section tag encountered.
* @return string * @return string
*/ */
protected function _renderTag($modifier, $tag_name) { protected function _renderTag($modifier, $tag_name, $whitespace) {
switch ($modifier) { switch ($modifier) {
case '#': case '#':
case '^': case '^':
@@ -527,7 +533,7 @@ class Mustache {
break; break;
case '>': case '>':
case '<': case '<':
return $this->_renderPartial($tag_name); return $this->_renderPartial($tag_name, $whitespace);
break; break;
case '{': case '{':
// strip the trailing } ... // strip the trailing } ...
@@ -590,9 +596,10 @@ class Mustache {
* @param string $tag_name * @param string $tag_name
* @return string * @return string
*/ */
protected function _renderPartial($tag_name) { protected function _renderPartial($tag_name, $whitespace = '') {
$view = clone($this); $view = clone($this);
return $view->render($this->_getPartial($tag_name));
return $whitespace . preg_replace('/\n(?!$)/s', "\n" . $whitespace, $view->render($this->_getPartial($tag_name)));
} }
/** /**