Skip to content

Commit cfbb016

Browse files
pdanpdanrstoenescu
authored andcommitted
Remove components entry, guard QResizeObserver (quasarframework#2258)
1 parent 404c15f commit cfbb016

File tree

7 files changed

+8
-33
lines changed

7 files changed

+8
-33
lines changed

src/components/datetime/QDatetimePicker.mat.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ export default {
1919
disable: Boolean,
2020
readonly: Boolean
2121
},
22-
components: {
23-
QBtn
24-
},
2522
directives: {
2623
Ripple
2724
},

src/components/input/QInput.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ import QIcon from '../icon/QIcon.js'
1111
export default {
1212
name: 'QInput',
1313
mixins: [FrameMixin, InputMixin],
14-
components: {
15-
QInputFrame,
16-
QSpinner,
17-
QResizeObservable
18-
},
1914
props: {
2015
value: { required: true },
2116
type: {

src/components/observables/QResizeObservable.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export default {
9494
clearTimeout(this.timer)
9595

9696
if (this.hasObserver) {
97-
this.observer.unobserve(this.$el.parentNode)
97+
this.$el.parentNode && this.observer.unobserve(this.$el.parentNode)
9898
return
9999
}
100100

src/components/option-group/QOptionGroup.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ import QCheckbox from '../checkbox/QCheckbox.js'
33
import QToggle from '../toggle/QToggle.js'
44
import ParentFieldMixin from '../../mixins/parent-field.js'
55

6+
const components = {
7+
radio: QRadio,
8+
checkbox: QCheckbox,
9+
toggle: QToggle
10+
}
11+
612
export default {
713
name: 'QOptionGroup',
814
mixins: [ParentFieldMixin],
9-
components: {
10-
QRadio,
11-
QCheckbox,
12-
QToggle
13-
},
1415
props: {
1516
value: {
1617
required: true
@@ -35,7 +36,7 @@ export default {
3536
},
3637
computed: {
3738
component () {
38-
return `q-${this.type}`
39+
return components[this.type]
3940
},
4041
model () {
4142
return Array.isArray(this.value) ? this.value.slice() : this.value

src/components/select/QSelect.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,6 @@ function defaultFilterFn (terms, obj) {
1818
export default {
1919
name: 'QSelect',
2020
mixins: [FrameMixin, KeyboardSelectionMixin],
21-
components: {
22-
QSearch,
23-
QPopover,
24-
QList,
25-
QItemWrapper,
26-
QCheckbox,
27-
QRadio,
28-
QToggle,
29-
QIcon,
30-
QInputFrame,
31-
QChip
32-
},
3321
props: {
3422
filter: [Function, Boolean],
3523
filterPlaceholder: String,

src/components/stepper/QStepper.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ import frameDebounce from '../../utils/frame-debounce.js'
33

44
export default {
55
name: 'QStepper',
6-
components: {
7-
StepTab
8-
},
96
props: {
107
value: [Number, String],
118
color: {

src/components/stepper/StepTab.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ import Ripple from '../../directives/ripple.js'
33

44
export default {
55
name: 'QStepTab',
6-
components: {
7-
QIcon
8-
},
96
directives: {
107
Ripple
118
},

0 commit comments

Comments
 (0)