diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-06-08 07:43:12 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-06-08 07:43:12 +0900 |
| commit | 3d40a7df003fa0922d1362a0e2d601846a9b850d (patch) | |
| tree | a89d00a888c534d1e11027d10681809851449dcc /src | |
| parent | Merge pull request #1682 from syuilo/l10n_master (diff) | |
| download | misskey-3d40a7df003fa0922d1362a0e2d601846a9b850d.tar.gz misskey-3d40a7df003fa0922d1362a0e2d601846a9b850d.tar.bz2 misskey-3d40a7df003fa0922d1362a0e2d601846a9b850d.zip | |
:v:
Diffstat (limited to 'src')
6 files changed, 11 insertions, 32 deletions
diff --git a/src/client/app/desktop/views/pages/deck/deck.column-core.vue b/src/client/app/desktop/views/pages/deck/deck.column-core.vue index 8046480ec6..28e7f13650 100644 --- a/src/client/app/desktop/views/pages/deck/deck.column-core.vue +++ b/src/client/app/desktop/views/pages/deck/deck.column-core.vue @@ -1,10 +1,10 @@ <template> -<x-widgets-column v-if="column.type == 'widgets'" :column="column" :is-stacked="isStacked" :is-active="isActive"/> -<x-notifications-column v-else-if="column.type == 'notifications'" :column="column" :is-stacked="isStacked" :is-active="isActive"/> -<x-tl-column v-else-if="column.type == 'home'" :column="column" :is-stacked="isStacked" :is-active="isActive"/> -<x-tl-column v-else-if="column.type == 'local'" :column="column" :is-stacked="isStacked" :is-active="isActive"/> -<x-tl-column v-else-if="column.type == 'global'" :column="column" :is-stacked="isStacked" :is-active="isActive"/> -<x-tl-column v-else-if="column.type == 'list'" :column="column" :is-stacked="isStacked" :is-active="isActive"/> +<x-widgets-column v-if="column.type == 'widgets'" :column="column" :is-stacked="isStacked"/> +<x-notifications-column v-else-if="column.type == 'notifications'" :column="column" :is-stacked="isStacked"/> +<x-tl-column v-else-if="column.type == 'home'" :column="column" :is-stacked="isStacked"/> +<x-tl-column v-else-if="column.type == 'local'" :column="column" :is-stacked="isStacked"/> +<x-tl-column v-else-if="column.type == 'global'" :column="column" :is-stacked="isStacked"/> +<x-tl-column v-else-if="column.type == 'list'" :column="column" :is-stacked="isStacked"/> </template> <script lang="ts"> @@ -29,11 +29,6 @@ export default Vue.extend({ type: Boolean, required: false, default: false - }, - isActive: { - type: Boolean, - required: false, - default: true } } }); diff --git a/src/client/app/desktop/views/pages/deck/deck.column.vue b/src/client/app/desktop/views/pages/deck/deck.column.vue index 976a424a62..bfd7924b03 100644 --- a/src/client/app/desktop/views/pages/deck/deck.column.vue +++ b/src/client/app/desktop/views/pages/deck/deck.column.vue @@ -25,10 +25,6 @@ export default Vue.extend({ type: Boolean, required: true }, - isActive: { - type: Boolean, - required: true - }, name: { type: String, required: false @@ -57,7 +53,7 @@ export default Vue.extend({ data() { return { count: 0, - active: this.isActive + active: true }; }, 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 1e3500e48e..220e938a46 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 @@ <template> -<x-column :name="name" :column="column" :is-stacked="isStacked" :is-active="isActive"> +<x-column :name="name" :column="column" :is-stacked="isStacked"> <span slot="header">%fa:bell R%{{ name }}</span> <x-notifications/> @@ -25,10 +25,6 @@ export default Vue.extend({ isStacked: { type: Boolean, required: true - }, - isActive: { - type: Boolean, - required: true } }, 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 333e776b70..30add843eb 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 @@ <template> -<x-column :menu="menu" :name="name" :column="column" :is-stacked="isStacked" :is-active="isActive"> +<x-column :menu="menu" :name="name" :column="column" :is-stacked="isStacked"> <span slot="header"> <template v-if="column.type == 'home'">%fa:home%</template> <template v-if="column.type == 'local'">%fa:R comments%</template> @@ -38,10 +38,6 @@ export default Vue.extend({ isStacked: { type: Boolean, required: true - }, - isActive: { - type: Boolean, - required: true } }, diff --git a/src/client/app/desktop/views/pages/deck/deck.vue b/src/client/app/desktop/views/pages/deck/deck.vue index fa2d90ed0e..460a99036d 100644 --- a/src/client/app/desktop/views/pages/deck/deck.vue +++ b/src/client/app/desktop/views/pages/deck/deck.vue @@ -4,7 +4,7 @@ <template v-for="ids in layout"> <div v-if="ids.length > 1" class="folder"> <template v-for="id, i in ids"> - <x-column-core :ref="id" :key="id" :column="columns.find(c => c.id == id)" :is-stacked="true" :is-active="i == 0"/> + <x-column-core :ref="id" :key="id" :column="columns.find(c => c.id == id)" :is-stacked="true"/> </template> </div> <x-column-core v-else :ref="ids[0]" :key="ids[0]" :column="columns.find(c => c.id == ids[0])"/> 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 68724677b4..2b35e5b25e 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 @@ <template> -<x-column :menu="menu" :naked="true" :narrow="true" :name="name" :column="column" :is-stacked="isStacked" :is-active="isActive" class="wtdtxvecapixsepjtcupubtsmometobz"> +<x-column :menu="menu" :naked="true" :narrow="true" :name="name" :column="column" :is-stacked="isStacked" class="wtdtxvecapixsepjtcupubtsmometobz"> <span slot="header">%fa:calculator%{{ name }}</span> <div class="gqpwvtwtprsbmnssnbicggtwqhmylhnq"> @@ -72,10 +72,6 @@ export default Vue.extend({ isStacked: { type: Boolean, required: true - }, - isActive: { - type: Boolean, - required: true } }, |