2949

common/modules/documentation/assets/src/js/accordion.js

@@ -14,7 +14,6 @@ if($('.set').length){
       $('.set_in').slideUp(200);
       $(this).siblings('.set_in').slideDown(200);
     }
-    return false;
     
   });
 }
\ No newline at end of file

common/modules/documentation/models/DocList.php

@@ -168,12 +168,12 @@ class DocList extends \yii\db\ActiveRecord
         $thisLevel = DocList::find()->where(['=', 'parent_id', $parent_id])->orderBy(['position' => SORT_ASC])->all();
         foreach ($thisLevel as $level) {
             $docContents = $level->docContents;
-            $url = ($docContents) ? $docContents[0]->lang->url : '';
+            $url = ($docContents) ? '/' . $docContents[0]->lang->url : '#';
 
             $curent = [
                 'id' => $level->id,
                 'text' => $level->lang->name,
-                'url' => '/' . $url,
+                'url' => $url,
                 'state' => [
                     'selected' => $updated->id == $level->id,
                     'expanded' => true,
@@ -201,10 +201,13 @@ class DocList extends \yii\db\ActiveRecord
             if (isset($item['nodes']) && is_array($item['nodes']))
                 $ch = $this->getList($item['nodes'], $open, false);
             $active = '';
-            if ($item['url'] == yii::$app->request->url) {
+            if (
+                    $item['url'] == yii::$app->request->url ||
+                    ($baseLevel && $open)
+            ) {
                 $active = 'active';
             }
-            $list[] = Html::tag('li', Html::a($item['text'], $item['url']) . $ch, ['class' => $open.' '.$active]);
+            $list[] = Html::tag('li', Html::a($item['text'], $item['url']) . $ch, ['class' => $active]);
             if ($item['url'] == yii::$app->request->url) {
                 $open = 'active';
             }