Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: チャット画面 / チャットパレットのアイコンから画像変更画面を開く #128

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

feat: チャット画面 / チャットパレットのアイコンから画像変更画面を開く #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fd6f1f
feat:画像変更を開くHTML修正、メソッド追加
NktAts Aug 9, 2020
b1af5b0
feat:画像変更の中身を実装
NktAts Aug 9, 2020
2ec79cd
fix: 型認識を正常な形に変更
NktAts Aug 9, 2020
fabd569
fix: デバッグ用ログを削除
NktAts Aug 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/component/chat-input/chat-input.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="table" [ngClass]="{ 'direct-message': isDirect }">
<div class="table-cell imagebox">
<img *ngIf="0 < imageFile.url.length" class="image" [src]="imageFile.url | safe: 'resourceUrl'" />
<img (click)="openCharacterImageChange()" *ngIf="0 < imageFile.url.length" class="image" [src]="imageFile.url | safe: 'resourceUrl'" />
</div>
<div class="table-cell">
<div>
Expand All @@ -24,7 +24,7 @@
</div>
<div>
<form>
<textarea class="chat-input" placeholder="Enterで送信 Shift+Enterで改行" [(ngModel)]="text"
<textarea class="chat-input" placeholder="Enterで送信 Shift+Enterで改行 アイコンクリックで画像変更" [(ngModel)]="text"
[ngModelOptions]="{standalone: true}" (input)="onInput()" (keydown.enter)="sendChat($event)"
#textArea></textarea>
<button type="submit" (click)="sendChat(null)">SEND</button>
Expand Down
25 changes: 24 additions & 1 deletion src/app/component/chat-input/chat-input.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ import { TextViewComponent } from 'component/text-view/text-view.component';
import { ChatMessageService } from 'service/chat-message.service';
import { PanelOption, PanelService } from 'service/panel.service';
import { PointerDeviceService } from 'service/pointer-device.service';
import { FileSelecterComponent } from 'component/file-selecter/file-selecter.component';
import { ModalService } from 'service/modal.service';
import { PeerCursorComponent } from 'component/peer-cursor/peer-cursor.component';

@Component({
selector: 'chat-input',
Expand Down Expand Up @@ -84,7 +87,8 @@ export class ChatInputComponent implements OnInit, OnDestroy {
private ngZone: NgZone,
public chatMessageService: ChatMessageService,
private panelService: PanelService,
private pointerDeviceService: PointerDeviceService
private pointerDeviceService: PointerDeviceService,
private modalService: ModalService
) { }

ngOnInit(): void {
Expand Down Expand Up @@ -231,6 +235,25 @@ export class ChatInputComponent implements OnInit, OnDestroy {
});
}

openCharacterImageChange() {
let object = ObjectStore.instance.get(this.sendFrom);
if(!object) return;

this.modalService.open<string>(FileSelecterComponent, { isAllowedEmpty: true }).then(value => {
if(object instanceof PeerCursor) {
if(!object.image || !value) return;
object.imageIdentifier = value;
}
else if(object instanceof GameCharacter) {
if(!object.imageDataElement || !value) return;
let element = object.imageDataElement.getFirstElementByName('imageIdentifier');
if(!element) return;
element.value = value;
} else return;
});

}

private allowsChat(gameCharacter: GameCharacter): boolean {
switch (gameCharacter.location.name) {
case 'table':
Expand Down