summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-02-22 02:15:46 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-02-22 02:15:46 +0900
commit73029df58ae7c32ad9cc1e3ff4828e0547635bf3 (patch)
tree4dfa521e59be308e701d755469c05507bc5fff64 /src
parentwip (diff)
downloadsharkey-73029df58ae7c32ad9cc1e3ff4828e0547635bf3.tar.gz
sharkey-73029df58ae7c32ad9cc1e3ff4828e0547635bf3.tar.bz2
sharkey-73029df58ae7c32ad9cc1e3ff4828e0547635bf3.zip
wip
Diffstat (limited to 'src')
-rw-r--r--src/web/app/common/mios.ts5
-rw-r--r--src/web/app/desktop/api/post.ts21
-rw-r--r--src/web/app/mobile/api/notify.ts3
-rw-r--r--src/web/app/mobile/api/post.ts31
-rw-r--r--src/web/app/mobile/script.ts8
-rw-r--r--src/web/app/mobile/views/components/post-form.vue2
6 files changed, 53 insertions, 17 deletions
diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index 4b9375f548..a37c5d6f78 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -42,7 +42,10 @@ export type API = {
default?: string;
}) => Promise<string>;
- post: () => void;
+ post: (opts?: {
+ reply?: any;
+ repost?: any;
+ }) => void;
notify: (message: string) => void;
};
diff --git a/src/web/app/desktop/api/post.ts b/src/web/app/desktop/api/post.ts
index 4eebd747fb..cf49615df3 100644
--- a/src/web/app/desktop/api/post.ts
+++ b/src/web/app/desktop/api/post.ts
@@ -1,6 +1,21 @@
import PostFormWindow from '../views/components/post-form-window.vue';
+import RepostFormWindow from '../views/components/repost-form-window.vue';
-export default function() {
- const vm = new PostFormWindow().$mount();
- document.body.appendChild(vm.$el);
+export default function(opts) {
+ const o = opts || {};
+ if (o.repost) {
+ const vm = new RepostFormWindow({
+ propsData: {
+ repost: o.repost
+ }
+ }).$mount();
+ document.body.appendChild(vm.$el);
+ } else {
+ const vm = new PostFormWindow({
+ propsData: {
+ reply: o.reply
+ }
+ }).$mount();
+ document.body.appendChild(vm.$el);
+ }
}
diff --git a/src/web/app/mobile/api/notify.ts b/src/web/app/mobile/api/notify.ts
new file mode 100644
index 0000000000..82780d196f
--- /dev/null
+++ b/src/web/app/mobile/api/notify.ts
@@ -0,0 +1,3 @@
+export default function(message) {
+ alert(message);
+}
diff --git a/src/web/app/mobile/api/post.ts b/src/web/app/mobile/api/post.ts
index 11ffc779f4..3ceb10496a 100644
--- a/src/web/app/mobile/api/post.ts
+++ b/src/web/app/mobile/api/post.ts
@@ -1,5 +1,9 @@
+import PostForm from '../views/components/post-form.vue';
+import RepostForm from '../views/components/repost-form.vue';
+
+export default function(opts) {
+ const o = opts || {};
-export default opts => {
const app = document.getElementById('app');
app.style.display = 'none';
@@ -7,8 +11,23 @@ export default opts => {
app.style.display = 'block';
}
- const form = riot.mount(document.body.appendChild(document.createElement('mk-post-form')), opts)[0];
- form
- .on('cancel', recover)
- .on('post', recover);
-};
+ if (o.repost) {
+ const vm = new RepostForm({
+ propsData: {
+ repost: o.repost
+ }
+ }).$mount();
+ vm.$once('cancel', recover);
+ vm.$once('post', recover);
+ document.body.appendChild(vm.$el);
+ } else {
+ const vm = new PostForm({
+ propsData: {
+ reply: o.reply
+ }
+ }).$mount();
+ vm.$once('cancel', recover);
+ vm.$once('post', recover);
+ document.body.appendChild(vm.$el);
+ }
+}
diff --git a/src/web/app/mobile/script.ts b/src/web/app/mobile/script.ts
index 339c9a8e46..1d25280d91 100644
--- a/src/web/app/mobile/script.ts
+++ b/src/web/app/mobile/script.ts
@@ -13,8 +13,6 @@ import dialog from './api/dialog';
import input from './api/input';
import post from './api/post';
import notify from './api/notify';
-import updateAvatar from './api/update-avatar';
-import updateBanner from './api/update-banner';
import MkIndex from './views/pages/index.vue';
import MkUser from './views/pages/user/user.vue';
@@ -35,15 +33,13 @@ init((launch) => {
document.body.setAttribute('ontouchstart', '');
// Launch the app
- const [app, os] = launch(os => ({
+ const [app] = launch(os => ({
chooseDriveFolder,
chooseDriveFile,
dialog,
input,
post,
- notify,
- updateAvatar: updateAvatar(os),
- updateBanner: updateBanner(os)
+ notify
}));
// Routing
diff --git a/src/web/app/mobile/views/components/post-form.vue b/src/web/app/mobile/views/components/post-form.vue
index 091056bcd3..6c41a73b51 100644
--- a/src/web/app/mobile/views/components/post-form.vue
+++ b/src/web/app/mobile/views/components/post-form.vue
@@ -25,7 +25,7 @@
<button class="poll" @click="addPoll">%fa:chart-pie%</button>
<input ref="file" type="file" accept="image/*" multiple="multiple" onchange={ changeFile }/>
</div>
-</div
+</div>
</template>
<script lang="ts">