From 0711027e0135d1020860d00faea2caeffb34d0a2 Mon Sep 17 00:00:00 2001 From: Alex-Code Date: Mon, 30 Jun 2014 11:24:31 +0100 Subject: [PATCH 1/4] Allow single items to set their encoding option --- extensions/bootstrap/Dropdown.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/bootstrap/Dropdown.php b/extensions/bootstrap/Dropdown.php index b170bc8171..a69f752fd6 100644 --- a/extensions/bootstrap/Dropdown.php +++ b/extensions/bootstrap/Dropdown.php @@ -80,7 +80,8 @@ class Dropdown extends Widget if (!isset($item['label'])) { throw new InvalidConfigException("The 'label' option is required."); } - $label = $this->encodeLabels ? Html::encode($item['label']) : $item['label']; + $encodeLabel = isset($item['encode']) ? $item['encode'] : $this->encodeLabels; + $label = $encodeLabel ? Html::encode($item['label']) : $item['label']; $options = ArrayHelper::getValue($item, 'options', []); $linkOptions = ArrayHelper::getValue($item, 'linkOptions', []); $linkOptions['tabindex'] = '-1'; From e1089618f843f58276509a9f8b25c708f62efac2 Mon Sep 17 00:00:00 2001 From: Alex-Code Date: Mon, 30 Jun 2014 11:26:37 +0100 Subject: [PATCH 2/4] Allow an item to choose if it's encoded. --- extensions/bootstrap/Nav.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/bootstrap/Nav.php b/extensions/bootstrap/Nav.php index fb9e560468..3a5791f2e5 100644 --- a/extensions/bootstrap/Nav.php +++ b/extensions/bootstrap/Nav.php @@ -148,7 +148,8 @@ class Nav extends Widget if (!isset($item['label'])) { throw new InvalidConfigException("The 'label' option is required."); } - $label = $this->encodeLabels ? Html::encode($item['label']) : $item['label']; + $encodeLabel = isset($item['encode']) ? $item['encode'] : $this->encodeLabels; + $label = $encodeLabel ? Html::encode($item['label']) : $item['label']; $options = ArrayHelper::getValue($item, 'options', []); $items = ArrayHelper::getValue($item, 'items'); $url = ArrayHelper::getValue($item, 'url', '#'); From 8595c1a15f969fa267b2d830b479731c89a80823 Mon Sep 17 00:00:00 2001 From: Alex-Code Date: Mon, 30 Jun 2014 12:03:51 +0100 Subject: [PATCH 3/4] Update CHANGELOG.md --- extensions/bootstrap/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/bootstrap/CHANGELOG.md b/extensions/bootstrap/CHANGELOG.md index bf979489fe..874ac7fee3 100644 --- a/extensions/bootstrap/CHANGELOG.md +++ b/extensions/bootstrap/CHANGELOG.md @@ -9,6 +9,7 @@ Yii Framework 2 bootstrap extension Change Log - Bug #3749: Fixed invalid plugin registration and ensure clickable links in dropdown (kartik-v) - Enh #4024: Added ability to `yii\bootstrap\Tabs` to encode each `Tabs::items['label']` separately (creocoder, umneeq) - Chg #3036: Upgraded Twitter Bootstrap to 3.1.x (qiangxue) +- Enh #4120: Added ability for each item to choose it's encoding option in `Dropdown` and `Nav` 2.0.0-beta April 13, 2014 ------------------------- From 8683b7905d68a2e3b470c4f8b0e2552919552ee4 Mon Sep 17 00:00:00 2001 From: Alex-Code Date: Mon, 30 Jun 2014 12:04:22 +0100 Subject: [PATCH 4/4] Update CHANGELOG.md --- extensions/bootstrap/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bootstrap/CHANGELOG.md b/extensions/bootstrap/CHANGELOG.md index 874ac7fee3..d5a204c36c 100644 --- a/extensions/bootstrap/CHANGELOG.md +++ b/extensions/bootstrap/CHANGELOG.md @@ -9,7 +9,7 @@ Yii Framework 2 bootstrap extension Change Log - Bug #3749: Fixed invalid plugin registration and ensure clickable links in dropdown (kartik-v) - Enh #4024: Added ability to `yii\bootstrap\Tabs` to encode each `Tabs::items['label']` separately (creocoder, umneeq) - Chg #3036: Upgraded Twitter Bootstrap to 3.1.x (qiangxue) -- Enh #4120: Added ability for each item to choose it's encoding option in `Dropdown` and `Nav` +- Enh #4120: Added ability for each item to choose it's encoding option in `Dropdown` and `Nav` (Alex-Code) 2.0.0-beta April 13, 2014 -------------------------