moris/misskey
1
0
Fork 0
forked from mirror/misskey
Code Pull Requests Activity

Merge branch 'master' into hybrid-tl

Browse Source
This commit is contained in:
syuilo 2018-07-11 13:47:26 +09:00
commit 0cc00101dc
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/app/common/scripts/streaming/games/reversi-game.ts → src/client/app/common/scripts/streaming/games/reversi/reversi-game.ts
View File

@ -1,5 +1,5 @@
import Stream from '../stream'; import Stream from '../../stream';
import MiOS from '../../../../mios'; import MiOS from '../../../../../mios';
export class ReversiGameStream extends Stream { export class ReversiGameStream extends Stream {
constructor(os: MiOS, me, game) { constructor(os: MiOS, me, game) {

6
src/client/app/common/scripts/streaming/games/reversi.ts → src/client/app/common/scripts/streaming/games/reversi/reversi.ts
View File

@ -1,6 +1,6 @@
import StreamManager from '../stream-manager'; import StreamManager from '../../stream-manager';
import Stream from '../stream'; import Stream from '../../stream';
import MiOS from '../../../../mios'; import MiOS from '../../../../../mios';
export class ReversiStream extends Stream { export class ReversiStream extends Stream {
constructor(os: MiOS, me) { constructor(os: MiOS, me) {

4
src/client/app/common/views/components/reversi.game.vue → src/client/app/common/views/components/games/reversi/reversi.game.vue
View File

@ -58,8 +58,8 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import * as CRC32 from 'crc-32'; import * as CRC32 from 'crc-32';
import Reversi, { Color } from '../../../../../games/reversi/core'; import Reversi, { Color } from '../../../../../../../games/reversi/core';
import { url } from '../../../config'; import { url } from '../../../../../config';
export default Vue.extend({ export default Vue.extend({
props: ['initGame', 'connection'], props: ['initGame', 'connection'],

2
src/client/app/common/views/components/reversi.gameroom.vue → src/client/app/common/views/components/games/reversi/reversi.gameroom.vue
View File

@ -9,7 +9,7 @@
import Vue from 'vue'; import Vue from 'vue';
import XGame from './reversi.game.vue'; import XGame from './reversi.game.vue';
import XRoom from './reversi.room.vue'; import XRoom from './reversi.room.vue';
import { ReversiGameStream } from '../../scripts/streaming/reversi-game'; import { ReversiGameStream } from '../../../../scripts/streaming/games/reversi-game';
export default Vue.extend({ export default Vue.extend({
components: { components: {

2
src/client/app/common/views/components/reversi.room.vue → src/client/app/common/views/components/games/reversi/reversi.room.vue
View File

@ -94,7 +94,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import * as maps from '../../../../../games/reversi/maps'; import * as maps from '../../../../../../../games/reversi/maps';
export default Vue.extend({ export default Vue.extend({
props: ['game', 'connection'], props: ['game', 'connection'],

0
src/client/app/common/views/components/reversi.vue → src/client/app/common/views/components/games/reversi/reversi.vue
View File

2
src/client/app/common/views/components/index.ts
View File

@ -27,7 +27,7 @@ import urlPreview from './url-preview.vue';
import twitterSetting from './twitter-setting.vue'; import twitterSetting from './twitter-setting.vue';
import fileTypeIcon from './file-type-icon.vue'; import fileTypeIcon from './file-type-icon.vue';
import Switch from './switch.vue'; import Switch from './switch.vue';
import Reversi from './reversi.vue'; import Reversi from './games/reversi/reversi.vue';
import welcomeTimeline from './welcome-timeline.vue'; import welcomeTimeline from './welcome-timeline.vue';
import uiInput from './ui/input.vue'; import uiInput from './ui/input.vue';
import uiButton from './ui/button.vue'; import uiButton from './ui/button.vue';

2
src/client/app/common/views/components/messaging-room.message.vue
View File

@ -22,7 +22,7 @@
<div></div> <div></div>
<mk-url-preview v-for="url in urls" :url="url" :key="url"/> <mk-url-preview v-for="url in urls" :url="url" :key="url"/>
<footer> <footer>
<span class="read" v-if="isMe && message.isRead">%i18n:@is-read%</p> <span class="read" v-if="isMe && message.isRead">%i18n:@is-read%</span>
<mk-time :time="message.createdAt"/> <mk-time :time="message.createdAt"/>
<template v-if="message.is_edited">%fa:pencil-alt%</template> <template v-if="message.is_edited">%fa:pencil-alt%</template>
</footer> </footer>

2
src/client/app/mios.ts
View File

@ -11,7 +11,7 @@ import { DriveStreamManager } from './common/scripts/streaming/drive';
import { ServerStatsStreamManager } from './common/scripts/streaming/server-stats'; import { ServerStatsStreamManager } from './common/scripts/streaming/server-stats';
import { NotesStatsStreamManager } from './common/scripts/streaming/notes-stats'; import { NotesStatsStreamManager } from './common/scripts/streaming/notes-stats';
import { MessagingIndexStreamManager } from './common/scripts/streaming/messaging-index'; import { MessagingIndexStreamManager } from './common/scripts/streaming/messaging-index';
import { ReversiStreamManager } from './common/scripts/streaming/games/reversi'; import { ReversiStreamManager } from './common/scripts/streaming/games/reversi/reversi';
import Err from './common/views/components/connect-failed.vue'; import Err from './common/views/components/connect-failed.vue';
import { LocalTimelineStreamManager } from './common/scripts/streaming/local-timeline'; import { LocalTimelineStreamManager } from './common/scripts/streaming/local-timeline';