Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to apply active and active-ancestor classes to nodes retrieved via getDescendants() #21

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions models/Navee_NodeModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,27 @@ public function userGroupSelected($userGroupId)
public function getDescendants($dist = null)
{
$descendants = parent::getDescendants($dist);

// variables
$activeNodes = array();

foreach ($descendants as $d)
{
craft()->navee->setLink($d);

if (craft()->navee->nodeActive($d))
{
$activeNodes[] = $d;
}
}

if (sizeof($activeNodes))
{
$descendants = craft()->navee->setActiveNodeRelatives($descendants, $activeNodes);
}

$descendants = craft()->navee->setActiveClasses($descendants);

return $descendants;
}
}
14 changes: 8 additions & 6 deletions services/NaveeService.php
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,12 @@ public function setLink(Navee_NodeModel $node)
/**
* Checks to see if a node is active
*
* @access private
* @access public
* @param Navee_NodeModel $node
* @return bool
*/

private function nodeActive(Navee_NodeModel $node)
public function nodeActive(Navee_NodeModel $node)
{
$data = false;
$currentUri = ltrim(craft()->request->getPath(), '/');
Expand Down Expand Up @@ -270,13 +270,13 @@ private function ancestorRemoved(Navee_NodeModel $node, $removedNodes = array())
/**
* Sets flags in the relatives of active nodes marking them ancestors/descendants
*
* @access private
* @access public
* @param array $nodes
* @param array $activeNodes
* @return array
*/

private function setActiveNodeRelatives($nodes = array(), $activeNodes = array())
public function setActiveNodeRelatives($nodes = array(), $activeNodes = array())
{
foreach ($nodes as $node)
{
Expand Down Expand Up @@ -336,12 +336,12 @@ private function setSiblingActive(Navee_NodeModel $node, $activeNode)
/**
* Sets appropriate active classes for each node
*
* @access private
* @access public
* @param array $nodes
* @return array
*/

private function setActiveClasses($nodes = array())
public function setActiveClasses($nodes = array())
{
if (!$this->config->disableActiveClass)
{
Expand All @@ -350,12 +350,14 @@ private function setActiveClasses($nodes = array())
// this is the active node
if ($node->active)
{
$node->class = str_replace($this->config->activeClass, '', $node->class);
$node->class = (strlen($node->class)) ? $node->class . ' ' . $this->config->activeClass : $this->config->activeClass;
}

// these are ancestors of the active node
if ($this->config->activeClassOnAncestors && $node->descendantActive)
{
$node->class = str_replace($this->config->ancestorActiveClass, '', $node->class);
$node->class = (strlen($node->class)) ? $node->class . ' ' . $this->config->ancestorActiveClass : $this->config->ancestorActiveClass;
}

Expand Down