({{ count }})
-
@@ -17,6 +17,18 @@ import Menu from '../../../../common/views/components/menu.vue';
export default Vue.extend({
props: {
+ column: {
+ type: Object,
+ required: true
+ },
+ isStacked: {
+ type: Boolean,
+ required: true
+ },
+ isActive: {
+ type: Boolean,
+ required: true
+ },
name: {
type: String,
required: false
@@ -39,21 +51,18 @@ export default Vue.extend({
},
inject: {
- column: { from: 'column' },
- _isActive: { from: 'isActive' },
- isStacked: { from: 'isStacked' },
getColumnVm: { from: 'getColumnVm' }
},
data() {
return {
count: 0,
- isActive: this._isActive
+ active: this.isActive
};
},
watch: {
- isActive(v) {
+ active(v) {
if (v && this.isScrollTop()) {
this.$emit('top');
}
@@ -79,12 +88,12 @@ export default Vue.extend({
toggleActive() {
if (!this.isStacked) return;
const vms = this.$store.state.settings.deck.layout.find(ids => ids.indexOf(this.column.id) != -1).map(id => this.getColumnVm(id));
- if (this.isActive && vms.filter(vm => vm.$el.classList.contains('isActive')).length == 1) return;
- this.isActive = !this.isActive;
+ if (this.active && vms.filter(vm => vm.$el.classList.contains('active')).length == 1) return;
+ this.active = !this.active;
},
isScrollTop() {
- return this.isActive && this.$refs.body.scrollTop == 0;
+ return this.active && this.$refs.body.scrollTop == 0;
},
onScroll() {
@@ -176,7 +185,7 @@ root(isDark)
box-shadow 0 2px 16px rgba(#000, 0.1)
overflow hidden
- &:not(.isActive)
+ &:not(.active)
flex-basis $header-height
min-height $header-height
diff --git a/src/client/app/desktop/views/pages/deck/deck.notifications-column.vue b/src/client/app/desktop/views/pages/deck/deck.notifications-column.vue
index 87f16211f..1e3500e48 100644
--- a/src/client/app/desktop/views/pages/deck/deck.notifications-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.notifications-column.vue
@@ -1,5 +1,5 @@
-
+
%fa:bell R%{{ name }}
@@ -17,7 +17,20 @@ export default Vue.extend({
XNotifications
},
- inject: ['column'],
+ props: {
+ column: {
+ type: Object,
+ required: true
+ },
+ isStacked: {
+ type: Boolean,
+ required: true
+ },
+ isActive: {
+ type: Boolean,
+ required: true
+ }
+ },
computed: {
name(): string {
diff --git a/src/client/app/desktop/views/pages/deck/deck.tl-column.vue b/src/client/app/desktop/views/pages/deck/deck.tl-column.vue
index 46d56bb05..333e776b7 100644
--- a/src/client/app/desktop/views/pages/deck/deck.tl-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.tl-column.vue
@@ -1,5 +1,5 @@
-
+
%fa:home%
%fa:R comments%
@@ -30,7 +30,20 @@ export default Vue.extend({
XListTl
},
- inject: ['column'],
+ props: {
+ column: {
+ type: Object,
+ required: true
+ },
+ isStacked: {
+ type: Boolean,
+ required: true
+ },
+ isActive: {
+ type: Boolean,
+ required: true
+ }
+ },
data() {
return {
diff --git a/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue b/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue
index 1f8fd8a9b..68724677b 100644
--- a/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.widgets-column.vue
@@ -1,5 +1,5 @@
-
+
%fa:calculator%{{ name }}
@@ -64,7 +64,20 @@ export default Vue.extend({
XDraggable
},
- inject: ['column'],
+ props: {
+ column: {
+ type: Object,
+ required: true
+ },
+ isStacked: {
+ type: Boolean,
+ required: true
+ },
+ isActive: {
+ type: Boolean,
+ required: true
+ }
+ },
data() {
return {