Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Y
yii2bootstrap
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
yii2bootstrap
Commits
1603a2b0
Commit
1603a2b0
authored
Jan 24, 2016
by
Klimov Paul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
`Nav::renderItem()` adjusted
parent
b6087e2a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
CHANGELOG.md
CHANGELOG.md
+1
-0
Nav.php
Nav.php
+3
-5
No files found.
CHANGELOG.md
View file @
1603a2b0
...
@@ -4,6 +4,7 @@ Yii Framework 2 bootstrap extension Change Log
...
@@ -4,6 +4,7 @@ Yii Framework 2 bootstrap extension Change Log
2.
0.6 under development
2.
0.6 under development
-----------------------
-----------------------
-
Bug #68: Fixed
`yii\bootstrap\Nav`
handling empty items (freezy-sk)
-
Bug #81: Fixed
`yii\bootstrap\ActiveField::radioList()`
and
`yii\bootstrap\ActiveField::checkboxList()`
ignore
`itemOptions`
(mikehaertl)
-
Bug #81: Fixed
`yii\bootstrap\ActiveField::radioList()`
and
`yii\bootstrap\ActiveField::checkboxList()`
ignore
`itemOptions`
(mikehaertl)
-
Bug #98: Fixed
`yii\bootstrap\ButtonDropdown`
setting
`href`
attribute for non
`a`
tags (13nightevil)
-
Bug #98: Fixed
`yii\bootstrap\ButtonDropdown`
setting
`href`
attribute for non
`a`
tags (13nightevil)
-
Enh #45: Added support for Bootstrap checkbox/radio toggle buttons (RomeroMsk, klimov-paul)
-
Enh #45: Added support for Bootstrap checkbox/radio toggle buttons (RomeroMsk, klimov-paul)
...
...
Nav.php
View file @
1603a2b0
...
@@ -177,7 +177,9 @@ class Nav extends Widget
...
@@ -177,7 +177,9 @@ class Nav extends Widget
$active
=
$this
->
isItemActive
(
$item
);
$active
=
$this
->
isItemActive
(
$item
);
}
}
if
(
!
empty
(
$items
))
{
if
(
empty
(
$items
))
{
$items
=
''
;
}
else
{
$linkOptions
[
'data-toggle'
]
=
'dropdown'
;
$linkOptions
[
'data-toggle'
]
=
'dropdown'
;
Html
::
addCssClass
(
$options
,
[
'widget'
=>
'dropdown'
]);
Html
::
addCssClass
(
$options
,
[
'widget'
=>
'dropdown'
]);
Html
::
addCssClass
(
$linkOptions
,
[
'widget'
=>
'dropdown-toggle'
]);
Html
::
addCssClass
(
$linkOptions
,
[
'widget'
=>
'dropdown-toggle'
]);
...
@@ -192,10 +194,6 @@ class Nav extends Widget
...
@@ -192,10 +194,6 @@ class Nav extends Widget
}
}
}
}
if
(
empty
(
$items
))
{
$items
=
''
;
}
if
(
$this
->
activateItems
&&
$active
)
{
if
(
$this
->
activateItems
&&
$active
)
{
Html
::
addCssClass
(
$options
,
'active'
);
Html
::
addCssClass
(
$options
,
'active'
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment