From 7d6a38d455e7b4360ee42956166190d920c7ca8c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 11 Feb 2018 13:09:46 +0900
Subject: [PATCH] wip
---
src/web/app/desktop/views/components/home.vue | 20 +++++++++----------
.../app/desktop/views/components/timeline.vue | 0
src/web/app/desktop/views/pages/home.vue | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
create mode 100644 src/web/app/desktop/views/components/timeline.vue
diff --git a/src/web/app/desktop/views/components/home.vue b/src/web/app/desktop/views/components/home.vue
index 987f272a09..076cbabe8e 100644
--- a/src/web/app/desktop/views/components/home.vue
+++ b/src/web/app/desktop/views/components/home.vue
@@ -41,10 +41,10 @@
<div ref="left" data-place="left">
<template v-for="widget in leftWidgets">
<div class="customize-container" v-if="customize" :key="widget.id" @contextmenu.stop.prevent="onWidgetContextmenu(widget.id)">
- <component :is="widget.name" :widget="widget" :ref="widget.id"/>
+ <component :is="'mk-hw-' + widget.name" :widget="widget" :ref="widget.id"/>
</div>
<template v-else>
- <component :is="widget.name" :key="widget.id" :widget="widget" :ref="widget.id"/>
+ <component :is="'mk-hw-' + widget.name" :key="widget.id" :widget="widget" :ref="widget.id"/>
</template>
</template>
</div>
@@ -53,24 +53,24 @@
<div class="maintop" ref="maintop" data-place="main" v-if="customize">
<template v-for="widget in centerWidgets">
<div class="customize-container" v-if="customize" :key="widget.id" @contextmenu.stop.prevent="onWidgetContextmenu(widget.id)">
- <component :is="widget.name" :widget="widget" :ref="widget.id"/>
+ <component :is="'mk-hw-' + widget.name" :widget="widget" :ref="widget.id"/>
</div>
<template v-else>
- <component :is="widget.name" :key="widget.id" :widget="widget" :ref="widget.id"/>
+ <component :is="'mk-hw-' + widget.name" :key="widget.id" :widget="widget" :ref="widget.id"/>
</template>
</template>
</div>
- <mk-timeline-home-widget ref="tl" @loaded="onTlLoaded" v-if="mode == 'timeline'"/>
- <mk-mentions-home-widget ref="tl" @loaded="onTlLoaded" v-if="mode == 'mentions'"/>
+ <mk-timeline ref="tl" @loaded="onTlLoaded" v-if="mode == 'timeline'"/>
+ <mk-mentions ref="tl" @loaded="onTlLoaded" v-if="mode == 'mentions'"/>
</main>
<div class="right">
<div ref="right" data-place="right">
<template v-for="widget in rightWidgets">
<div class="customize-container" v-if="customize" :key="widget.id" @contextmenu.stop.prevent="onWidgetContextmenu(widget.id)">
- <component :is="widget.name" :widget="widget" :ref="widget.id"/>
+ <component :is="'mk-hw-' + widget.name" :widget="widget" :ref="widget.id"/>
</div>
<template v-else>
- <component :is="widget.name" :key="widget.id" :widget="widget" :ref="widget.id"/>
+ <component :is="'mk-hw-' + widget.name" :key="widget.id" :widget="widget" :ref="widget.id"/>
</template>
</template>
</div>
@@ -79,9 +79,9 @@
</div>
</template>
-<script lang="typescript">
+<script lang="ts">
import Vue from 'vue';
-import uuid from 'uuid';
+import * as uuid from 'uuid';
import Sortable from 'sortablejs';
export default Vue.extend({
diff --git a/src/web/app/desktop/views/components/timeline.vue b/src/web/app/desktop/views/components/timeline.vue
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/web/app/desktop/views/pages/home.vue b/src/web/app/desktop/views/pages/home.vue
index 8a380fad0c..ff20291d5a 100644
--- a/src/web/app/desktop/views/pages/home.vue
+++ b/src/web/app/desktop/views/pages/home.vue
@@ -1,6 +1,6 @@
<template>
<mk-ui>
- <home ref="home" :mode="mode"/>
+ <mk-home ref="home" :mode="mode"/>
</mk-ui>
</template>