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
7644ecbc
Commit
7644ecbc
authored
Nov 20, 2015
by
Mehdi Achour
Committed by
Alexander Makarov
Nov 20, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #92: Allow overriding `data-toggle` in `yii\bootstrap\Tabs`
parent
6fd96d4b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
CHANGELOG.md
CHANGELOG.md
+1
-0
Tabs.php
Tabs.php
+9
-4
No files found.
CHANGELOG.md
View file @
7644ecbc
...
@@ -17,6 +17,7 @@ Yii Framework 2 bootstrap extension Change Log
...
@@ -17,6 +17,7 @@ Yii Framework 2 bootstrap extension Change Log
-
Enh #43: Added support for the static form controls via
`yii\bootstrap\Html`
(klimov-paul)
-
Enh #43: Added support for the static form controls via
`yii\bootstrap\Html`
(klimov-paul)
-
Enh #44: Fixed
`yii\bootstrap\ButtonDropdown`
renders two buttons with the same id, if 'split' is enabled (klimov-paul)
-
Enh #44: Fixed
`yii\bootstrap\ButtonDropdown`
renders two buttons with the same id, if 'split' is enabled (klimov-paul)
-
Enh #50: Added
`dropDownOptions`
that is passed to
`yii\bootstrap\Nav`
dropdown items (fbau123)
-
Enh #50: Added
`dropDownOptions`
that is passed to
`yii\bootstrap\Nav`
dropdown items (fbau123)
-
Enh #92: Allow overriding
`data-toggle`
in
`yii\bootstrap\Tabs`
(machour)
2.0.4 May 10, 2015
2.0.4 May 10, 2015
...
...
Tabs.php
View file @
7644ecbc
...
@@ -169,7 +169,9 @@ class Tabs extends Widget
...
@@ -169,7 +169,9 @@ class Tabs extends Widget
}
}
Html
::
addCssClass
(
$linkOptions
,
[
'widget'
=>
'dropdown-toggle'
]);
Html
::
addCssClass
(
$linkOptions
,
[
'widget'
=>
'dropdown-toggle'
]);
$linkOptions
[
'data-toggle'
]
=
'dropdown'
;
if
(
!
isset
(
$linkOptions
[
'data-toggle'
]))
{
$linkOptions
[
'data-toggle'
]
=
'dropdown'
;
}
$header
=
Html
::
a
(
$label
,
"#"
,
$linkOptions
)
.
"
\n
"
$header
=
Html
::
a
(
$label
,
"#"
,
$linkOptions
)
.
"
\n
"
.
Dropdown
::
widget
([
'items'
=>
$item
[
'items'
],
'clientOptions'
=>
false
,
'view'
=>
$this
->
getView
()]);
.
Dropdown
::
widget
([
'items'
=>
$item
[
'items'
],
'clientOptions'
=>
false
,
'view'
=>
$this
->
getView
()]);
}
else
{
}
else
{
...
@@ -185,7 +187,9 @@ class Tabs extends Widget
...
@@ -185,7 +187,9 @@ class Tabs extends Widget
if
(
isset
(
$item
[
'url'
]))
{
if
(
isset
(
$item
[
'url'
]))
{
$header
=
Html
::
a
(
$label
,
$item
[
'url'
],
$linkOptions
);
$header
=
Html
::
a
(
$label
,
$item
[
'url'
],
$linkOptions
);
}
else
{
}
else
{
$linkOptions
[
'data-toggle'
]
=
'tab'
;
if
(
!
isset
(
$linkOptions
[
'data-toggle'
]))
{
$linkOptions
[
'data-toggle'
]
=
'tab'
;
}
$header
=
Html
::
a
(
$label
,
'#'
.
$options
[
'id'
],
$linkOptions
);
$header
=
Html
::
a
(
$label
,
'#'
.
$options
[
'id'
],
$linkOptions
);
}
}
...
@@ -250,8 +254,9 @@ class Tabs extends Widget
...
@@ -250,8 +254,9 @@ class Tabs extends Widget
$options
[
'id'
]
=
ArrayHelper
::
getValue
(
$options
,
'id'
,
$this
->
options
[
'id'
]
.
'-dd'
.
$itemNumber
.
'-tab'
.
$n
);
$options
[
'id'
]
=
ArrayHelper
::
getValue
(
$options
,
'id'
,
$this
->
options
[
'id'
]
.
'-dd'
.
$itemNumber
.
'-tab'
.
$n
);
$item
[
'url'
]
=
'#'
.
$options
[
'id'
];
$item
[
'url'
]
=
'#'
.
$options
[
'id'
];
$item
[
'linkOptions'
][
'data-toggle'
]
=
'tab'
;
if
(
!
isset
(
$item
[
'linkOptions'
][
'data-toggle'
]))
{
$item
[
'linkOptions'
][
'data-toggle'
]
=
'tab'
;
}
$panes
[]
=
Html
::
tag
(
'div'
,
$content
,
$options
);
$panes
[]
=
Html
::
tag
(
'div'
,
$content
,
$options
);
unset
(
$item
);
unset
(
$item
);
...
...
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