+7
-21
lines changedFilter options
+7
-21
lines changed Original file line number Diff line number Diff line change
@@ -126,7 +126,7 @@
126 126
"description": "Sets the `placeholder` attribute value on the form control"
127 127
},
128 128
"disabled": {
129 -
"description": "When set to 'true', disables the component's functionality and places it in a disabled state"
129 +
"description": "When set to `true`, disables the component's functionality and places it in a disabled state"
130 130
},
131 131
"readonly": {
132 132
"description": "Sets the `readonly` attribute on the form control"
@@ -29,10 +29,6 @@ export const BNavItemDropdown = /*#__PURE__*/ Vue.extend({
29 29
toggleId() {
30 30
return this.safeId('_BV_toggle_')
31 31
},
32 -
isNav() {
33 -
// Signal to dropdown mixin that we are in a navbar
34 -
return true
35 -
},
36 32
dropdownClasses() {
37 33
return [this.directionClass, this.boundaryClass, { show: this.visible }]
38 34
},
@@ -34,15 +34,6 @@ describe('nav-item-dropdown', () => {
34 34
wrapper.destroy()
35 35
})
36 36 37 -
it('should have a flag that we are in a nav', async () => {
38 -
const wrapper = mount(BNavItemDropdown)
39 - 40 -
expect(wrapper.vm).toBeDefined()
41 -
expect(wrapper.vm.isNav).toBe(true)
42 - 43 -
wrapper.destroy()
44 -
})
45 - 46 37
it('should have custom toggle class when "toggle-class" prop set', async () => {
47 38
const wrapper = mount(BNavItemDropdown, {
48 39
propsData: {
@@ -98,11 +98,11 @@
98 98
"props": [
99 99
{
100 100
"prop": "text",
101 -
"description": "Text to place in the toggle button, or in the split button is split mode"
101 +
"description": "Text to place in the toggle element (link)"
102 102
},
103 103
{
104 104
"prop": "html",
105 -
"description": "HTML string to place in the toggle button, or in the split button is split mode. Use with caution"
105 +
"description": "HTML string to place in the toggle element (link). Use with caution"
106 106
},
107 107
{
108 108
"prop": "dropup",
@@ -138,16 +138,16 @@
138 138
},
139 139
{
140 140
"prop": "toggleClass",
141 -
"description": "CSS class (or classes) to add to the toggle button"
141 +
"description": "CSS class (or classes) to add to the toggle element (link)"
142 142
},
143 143
{
144 144
"prop": "noCaret",
145 -
"description": "Hide the caret indicator on the toggle button"
145 +
"description": "Hide the caret indicator on the toggle element (link)"
146 146
},
147 147
{
148 148
"prop": "boundary",
149 149
"version": "2.4.0",
150 -
"description": "The boundary constraint of the menu: 'scrollParent', 'window', 'viewport', or a reference to an HTMLElement. Has no effect when dropdown is inside a b-navbar"
150 +
"description": "The boundary constraint of the menu: 'scrollParent', 'window', 'viewport', or a reference to an HTMLElement. Has no effect when dropdown is inside a `<b-navbar>`"
151 151
}
152 152
],
153 153
"slots": [
@@ -127,8 +127,7 @@ export default {
127 127
// Position `static` is needed to allow menu to "breakout" of the `scrollParent`
128 128
// boundaries when boundary is anything other than `scrollParent`
129 129
// See: https://github.com/twbs/bootstrap/issues/24251#issuecomment-341413786
130 -
const { boundary } = this
131 -
return boundary !== 'scrollParent' || !boundary ? 'position-static' : ''
130 +
return this.boundary !== 'scrollParent' && !this.inNavbar ? 'position-static' : ''
132 131
}
133 132
},
134 133
watch: {
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4