UIMacros: {ifCurrent} calls isLinkCurrent() method

nette · Feb 25, 2015 · 33c893f · 33c893f
1 parent 878d3dc
commit 33c893f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Bridges/ApplicationLatte/UIMacros.php b/src/Bridges/ApplicationLatte/UIMacros.php
@@ -100,8 +100,10 @@ public function macroLink(MacroNode $node, PhpWriter $writer)
 	 */
 	public function macroIfCurrent(MacroNode $node, PhpWriter $writer)
 	{
-		return $writer->write(($node->args ? 'try { $_presenter->link(%node.word, %node.array?); } catch (Nette\Application\UI\InvalidLinkException $e) {}' : '')
-			. '; if ($_presenter->getLastCreatedRequestFlag("current")) {');
+		return $writer->write($node->args
+			? 'if ($_presenter->isLinkCurrent(%node.word, %node.array?)) {'
+			: 'if ($_presenter->getLastCreatedRequestFlag("current")) {'
+		);
 	}
 
 

diff --git a/tests/Application.Latte/UIMacros.isLinkCurrent.phpt b/tests/Application.Latte/UIMacros.isLinkCurrent.phpt
@@ -23,4 +23,8 @@ Assert::matchFile(__DIR__ . '/expected/UIMacros.isLinkCurrent.phtml', $latte->co
 <a href="{link default}" n:class="$presenter->isLinkCurrent() ? current">href before n:class</a>
 
 <a n:class="$presenter->isLinkCurrent() ? current" href="{link default}">href after n:class</a>
+
+{ifCurrent}empty{/ifCurrent}
+
+{ifCurrent default}default{/ifCurrent}
 '));
diff --git a/tests/Application.Latte/expected/UIMacros.isLinkCurrent.phtml b/tests/Application.Latte/expected/UIMacros.isLinkCurrent.phtml
@@ -5,5 +5,11 @@
 <a href="%A%"%A%>href before n:class</a>
 
 <a href="%A%"%A%>href after n:class</a>
+
+<?php if ($_presenter->getLastCreatedRequestFlag("current")) { ?>empty<?php } ?>
+
+
+<?php if ($_presenter->isLinkCurrent("default")) { ?>default<?php } ?>
+
 <?php
 %A%