fix(root-listeners): apply listen-on-root mixin to other components #684
Conversation
# Conflicts: # lib/components/form-fieldset.vue
# Conflicts: # lib/components/form-input.vue
# Conflicts: # lib/mixins/listen-on-root.js
# Conflicts: # docs/components/table/README.md # lib/components/table.vue # lib/mixins/form.js
# Conflicts: # lib/components/table.vue
|
Weird, I don't know why I'm showing changes in the docs. Or the form mixin... |
|
THat happend to me once. Did you do a squash merge from the master? IF so, it looses context of which other commits have happened. |
|
maybe try a merge from master branch back into your branch? |
lib/mixins/form.js
Outdated
| this.state ? `form-control-${this.state}` : null | ||
| ]; | ||
| }, | ||
| custom() { |
There was a problem hiding this comment.
Hmm, this shouldn't be in here anymore... s plain was moved only to the form-* components that have that option.
Same for the inputClass() computed prop (doesn't apply to all form components)
|
Yeah, I attempted a squash merge a while back so my PRs would stop showing a laundry list of merge commits, but it not worky muy bien. |
lib/mixins/form.js
Outdated
| type: String | ||
| }, | ||
| size: { | ||
| type: String |
There was a problem hiding this comment.
And state and size should not be in form.js any more either, as they have been moved over to the components that only need it.
|
We're down to the readme changes just being editor clean-up on save. |
docs/components/table/README.md
Outdated
| @@ -1,569 +1,43 @@ | |||
| # Tables | |||
|
|
|||
| > For displaying tabular data. `<b-table>` supports pagination, filtering, sorting, | |||
| custom rendering, events, and asynchronous data. | |||
| > For tabular data. Tables support pagination and custom rendering. | |||
There was a problem hiding this comment.
THhs looks like a revert of the new table features?
lib/utils/base-adapter.js
Outdated
| @@ -0,0 +1,90 @@ | |||
| export default class BaseAdapter { | |||
There was a problem hiding this comment.
Mybe these adapter additions should be moved into a separate PR?
|
@tmorehouse, reload the PR and check the diff again for changes. I think I've fixed this. |
| @@ -75,7 +75,8 @@ | |||
|
|
|||
| <script> | |||
| import { warn } from '../utils'; | |||
| import { keys } from '../utils/object.js' | |||
| import { keys } from '../utils/object.js'; | |||
| import { listenOnRootMixin } from '../mixins' | |||
There was a problem hiding this comment.
Goodness, look at me. I tried to fight my editor prefs and add a semicolon, and then I forget it in the very next line!
Closes #683