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
94840e67
Commit
94840e67
authored
Aug 12, 2015
by
freezy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Fixes #86] Fixed handling empty items in Nav
parent
09a5bfe7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
2 deletions
+40
-2
CHANGELOG.md
CHANGELOG.md
+1
-0
Nav.php
Nav.php
+5
-1
NavTest.php
tests/NavTest.php
+34
-1
No files found.
CHANGELOG.md
View file @
94840e67
...
@@ -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)
2.0.5 September 23, 2015
2.0.5 September 23, 2015
...
...
Nav.php
View file @
94840e67
...
@@ -176,7 +176,7 @@ class Nav extends Widget
...
@@ -176,7 +176,7 @@ class Nav extends Widget
$active
=
$this
->
isItemActive
(
$item
);
$active
=
$this
->
isItemActive
(
$item
);
}
}
if
(
$items
!==
null
)
{
if
(
!
empty
(
$items
)
)
{
$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'
]);
...
@@ -191,6 +191,10 @@ class Nav extends Widget
...
@@ -191,6 +191,10 @@ class Nav extends Widget
}
}
}
}
if
(
empty
(
$items
))
{
$items
=
''
;
}
if
(
$this
->
activateItems
&&
$active
)
{
if
(
$this
->
activateItems
&&
$active
)
{
Html
::
addCssClass
(
$options
,
'active'
);
Html
::
addCssClass
(
$options
,
'active'
);
}
}
...
...
tests/NavTest.php
View file @
94840e67
...
@@ -85,5 +85,38 @@ EXPECTED;
...
@@ -85,5 +85,38 @@ EXPECTED;
EXPECTED;
EXPECTED;
$this
->
assertEqualsWithoutLE
(
$expected
,
$out
);
$this
->
assertEqualsWithoutLE
(
$expected
,
$out
);
}
}
public
function
testEmptyItems
()
{
Nav
::
$counter
=
0
;
$out
=
Nav
::
widget
([
'items'
=>
[
[
'label'
=>
'Page1'
,
'items'
=>
null
,
],
[
'label'
=>
'Dropdown1'
,
'items'
=>
[
[
'label'
=>
'Page2'
,
'content'
=>
'Page2'
],
[
'label'
=>
'Page3'
,
'content'
=>
'Page3'
],
],
],
[
'label'
=>
'Page4'
,
'items'
=>
[],
],
],
]);
$expected
=
<<<EXPECTED
<ul id="w0" class="nav"><li><a href="#">Page1</a></li>
<li class="dropdown"><a class="dropdown-toggle" href="#" data-toggle="dropdown">Dropdown1 <b class="caret"></b></a><ul id="w1" class="dropdown-menu"><li class="dropdown-header">Page2</li>
<li class="dropdown-header">Page3</li></ul></li>
<li><a href="#">Page4</a></li></ul>
EXPECTED;
$this
->
assertEqualsWithoutLE
(
$expected
,
$out
);
}
}
}
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