A RetroSearch Logo

Home - News ( United States | United Kingdom | Italy | Germany ) - Football scores

Search Query:

Showing content from https://github.com/bootstrap-vue/bootstrap-vue/commit/2d31f31909c002faa2a9d8bd8620115ddf8ce603 below:

attribute inheritance (#6217) · bootstrap-vue/bootstrap-vue@2d31f31 · GitHub

File tree Expand file treeCollapse file tree 1 file changed

+15

-15

lines changed

Filter options

Expand file treeCollapse file tree 1 file changed

+15

-15

lines changed Original file line number Diff line number Diff line change

@@ -1,10 +1,9 @@

1 -

import { Vue } from '../../vue'

1 +

import { Vue, mergeData } from '../../vue'

2 2

import { NAME_BADGE } from '../../constants/components'

3 3

import { PROP_TYPE_BOOLEAN, PROP_TYPE_STRING } from '../../constants/props'

4 4

import { omit, sortKeys } from '../../utils/object'

5 5

import { makeProp, makePropsConfigurable, pluckProps } from '../../utils/props'

6 6

import { isLink } from '../../utils/router'

7 -

import { normalizeSlotMixin } from '../../mixins/normalize-slot'

8 7

import { BLink, props as BLinkProps } from '../link/link'

9 8 10 9

// --- Props ---

@@ -28,28 +27,29 @@ export const props = makePropsConfigurable(

28 27

// @vue/component

29 28

export const BBadge = /*#__PURE__*/ Vue.extend({

30 29

name: NAME_BADGE,

31 -

mixins: [normalizeSlotMixin],

30 +

functional: true,

32 31

props,

33 -

render(h) {

34 -

const { variant, $props } = this

35 -

const link = isLink($props)

36 -

const tag = link ? BLink : this.tag

32 +

render(h, { props, data, children }) {

33 +

const { active, disabled } = props

34 +

const link = isLink(props)

35 +

const tag = link ? BLink : props.tag

36 +

const variant = props.variant || 'secondary'

37 37 38 38

return h(

39 39

tag,

40 -

{

40 +

mergeData(data, {

41 41

staticClass: 'badge',

42 42

class: [

43 -

variant ? `badge-${variant}` : 'badge-secondary',

43 +

`badge-${variant}`,

44 44

{

45 -

'badge-pill': this.pill,

46 -

active: this.active,

47 -

disabled: this.disabled

45 +

'badge-pill': props.pill,

46 +

active,

47 +

disabled

48 48

}

49 49

],

50 -

props: link ? pluckProps(linkProps, $props) : {}

51 -

},

52 -

this.normalizeSlot()

50 +

props: link ? pluckProps(linkProps, props) : {}

51 +

}),

52 +

children

53 53

)

54 54

}

55 55

})

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