bugfix
This commit is contained in:
		
							parent
							
								
									bf6a5c3669
								
							
						
					
					
						commit
						29ec8492ae
					
				@ -1,6 +1,5 @@
 | 
				
			|||||||
<div class="date-split">
 | 
					<div class="date-split">
 | 
				
			||||||
  <span class="line"></span>
 | 
					  <span class="line"></span>
 | 
				
			||||||
  <!-- {{ message.sendDate | date: 'short' }} -->
 | 
					  <span class="date">{{ dateInfo }}</span>
 | 
				
			||||||
  <span class="date">{{ dateInfo }}2019.10.3</span>
 | 
					 | 
				
			||||||
  <span class="line"></span>
 | 
					  <span class="line"></span>
 | 
				
			||||||
</div>
 | 
					</div>
 | 
				
			||||||
 | 
				
			|||||||
@ -18,7 +18,7 @@ export class DateSplitterComponent implements OnInit {
 | 
				
			|||||||
  ngOnInit() {
 | 
					  ngOnInit() {
 | 
				
			||||||
    this.dateInfo = this.datePipe.transform(
 | 
					    this.dateInfo = this.datePipe.transform(
 | 
				
			||||||
      this.message.sendDate,
 | 
					      this.message.sendDate,
 | 
				
			||||||
      'yyyy-MM-dd EEE'
 | 
					      'yyyy.MM.dd EEE'
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -1,3 +1,3 @@
 | 
				
			|||||||
<p>
 | 
					<div>
 | 
				
			||||||
  {{ contents }}
 | 
					  {{ contents }}
 | 
				
			||||||
</p>
 | 
					</div>
 | 
				
			||||||
 | 
				
			|||||||
@ -1,12 +1,11 @@
 | 
				
			|||||||
<div class="bubble-main">
 | 
					<div class="bubble-main">
 | 
				
			||||||
  <span>
 | 
					  <span class="content">
 | 
				
			||||||
    {{ content }}
 | 
					    {{ content }}
 | 
				
			||||||
  </span>
 | 
					  </span>
 | 
				
			||||||
  <span>
 | 
					  <span>
 | 
				
			||||||
    {{ message.sendDate | date: 'short' }}
 | 
					    {{ message.sendDate | date: 'short' }}
 | 
				
			||||||
  </span>
 | 
					  </span>
 | 
				
			||||||
</div>
 | 
					</div>
 | 
				
			||||||
  {{detailButteonShow}}
 | 
					 | 
				
			||||||
<div *ngIf="detailButteonShow" class="btn-box">
 | 
					<div *ngIf="detailButteonShow" class="btn-box">
 | 
				
			||||||
    <button mat-button (click)="onClickDetailView()">Detail View</button>
 | 
					  <button mat-button (click)="onClickDetailView()">Detail View</button>
 | 
				
			||||||
</div>
 | 
					</div>
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,12 @@
 | 
				
			|||||||
 | 
					@charset 'utf-8';
 | 
				
			||||||
 | 
					@import '../../../../ucap-webmessenger-app/src/assets/scss/global/common.scss';
 | 
				
			||||||
.bubble-main {
 | 
					.bubble-main {
 | 
				
			||||||
  padding: 14px;
 | 
					  padding: 14px;
 | 
				
			||||||
  text-align: left;
 | 
					  text-align: left;
 | 
				
			||||||
 | 
					  .content {
 | 
				
			||||||
 | 
					    max-width: 250px;
 | 
				
			||||||
 | 
					    @include ellipsis(1);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.btn-box {
 | 
					.btn-box {
 | 
				
			||||||
 | 
				
			|||||||
@ -1,8 +1,5 @@
 | 
				
			|||||||
<div class="chat-messages">
 | 
					<div class="chat-messages">
 | 
				
			||||||
  <!-- MESSAGE -->
 | 
					  <!-- MESSAGE -->
 | 
				
			||||||
  <ucap-chat-message-box-date-splitter *ngIf="getDateSplitter(i)" [message]="message">
 | 
					 | 
				
			||||||
  </ucap-chat-message-box-date-splitter>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  <div
 | 
					  <div
 | 
				
			||||||
    *ngFor="let message of messages; let i = index"
 | 
					    *ngFor="let message of messages; let i = index"
 | 
				
			||||||
    class="message-row"
 | 
					    class="message-row"
 | 
				
			||||||
@ -11,6 +8,13 @@
 | 
				
			|||||||
      contact: message.senderSeq !== loginRes.userSeq
 | 
					      contact: message.senderSeq !== loginRes.userSeq
 | 
				
			||||||
    }"
 | 
					    }"
 | 
				
			||||||
  >
 | 
					  >
 | 
				
			||||||
 | 
					    <div>
 | 
				
			||||||
 | 
					      <ucap-chat-message-box-date-splitter
 | 
				
			||||||
 | 
					        *ngIf="getDateSplitter(i)"
 | 
				
			||||||
 | 
					        [message]="message"
 | 
				
			||||||
 | 
					      >
 | 
				
			||||||
 | 
					      </ucap-chat-message-box-date-splitter>
 | 
				
			||||||
 | 
					    </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <div
 | 
					    <div
 | 
				
			||||||
      *ngIf="getIsInformation(message); then information; else contents"
 | 
					      *ngIf="getIsInformation(message); then information; else contents"
 | 
				
			||||||
@ -46,7 +50,7 @@
 | 
				
			|||||||
    </ng-template>
 | 
					    </ng-template>
 | 
				
			||||||
    <ng-template #contents>
 | 
					    <ng-template #contents>
 | 
				
			||||||
      <div *ngIf="getUserProfile(message.senderSeq) != ''" class="profile-img">
 | 
					      <div *ngIf="getUserProfile(message.senderSeq) != ''" class="profile-img">
 | 
				
			||||||
            <!-- <img
 | 
					        <!-- <img
 | 
				
			||||||
              class="avatar"
 | 
					              class="avatar"
 | 
				
			||||||
              style="width: 50px; height: 50px;"
 | 
					              style="width: 50px; height: 50px;"
 | 
				
			||||||
              [src]="
 | 
					              [src]="
 | 
				
			||||||
@ -59,71 +63,71 @@
 | 
				
			|||||||
                  | async
 | 
					                  | async
 | 
				
			||||||
              "
 | 
					              "
 | 
				
			||||||
            /> -->
 | 
					            /> -->
 | 
				
			||||||
            <ucap-ui-imaage
 | 
					        <ucap-ui-imaage
 | 
				
			||||||
              [style]="'width: 50px; height: 50px;'"
 | 
					          [style]="'width: 50px; height: 50px;'"
 | 
				
			||||||
              [imageClass]="'avatar'"
 | 
					          [imageClass]="'avatar'"
 | 
				
			||||||
              [base]="profileImageRoot"
 | 
					          [base]="profileImageRoot"
 | 
				
			||||||
              [path]="getUserProfile(message.senderSeq)"
 | 
					          [path]="getUserProfile(message.senderSeq)"
 | 
				
			||||||
              [default]="'assets/images/img_nophoto_50.png'"
 | 
					          [default]="'assets/images/img_nophoto_50.png'"
 | 
				
			||||||
            ></ucap-ui-imaage>
 | 
					        ></ucap-ui-imaage>
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      <div class="message-main">
 | 
					      <div class="message-main">
 | 
				
			||||||
        <div class="chat-name">
 | 
					        <div class="chat-name">
 | 
				
			||||||
            {{ getUserName(message.senderSeq) }}
 | 
					          {{ getUserName(message.senderSeq) }}
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      <div class="bubble">
 | 
					        <div class="bubble">
 | 
				
			||||||
        <ng-container
 | 
					          <ng-container
 | 
				
			||||||
          class="bubble"
 | 
					            class="bubble"
 | 
				
			||||||
          *ngIf="message.type !== EventType.NotificationForTimerRoom"
 | 
					            *ngIf="message.type !== EventType.NotificationForTimerRoom"
 | 
				
			||||||
          [ngSwitch]="message.type"
 | 
					            [ngSwitch]="message.type"
 | 
				
			||||||
        >
 | 
					 | 
				
			||||||
          <ucap-chat-message-box-mass
 | 
					 | 
				
			||||||
            *ngSwitchCase="EventType.MassText"
 | 
					 | 
				
			||||||
            [message]="message"
 | 
					 | 
				
			||||||
            (massDetail)="onMassDetail($event)"
 | 
					 | 
				
			||||||
          >
 | 
					          >
 | 
				
			||||||
          </ucap-chat-message-box-mass>
 | 
					            <ucap-chat-message-box-mass
 | 
				
			||||||
          <ucap-chat-message-box-file
 | 
					              *ngSwitchCase="EventType.MassText"
 | 
				
			||||||
            *ngSwitchCase="EventType.File"
 | 
					              [message]="message"
 | 
				
			||||||
            [message]="message"
 | 
					              (massDetail)="onMassDetail($event)"
 | 
				
			||||||
            (save)="onSave($event)"
 | 
					            >
 | 
				
			||||||
            (imageViewer)="onImageViewer($event)"
 | 
					            </ucap-chat-message-box-mass>
 | 
				
			||||||
          >
 | 
					            <ucap-chat-message-box-file
 | 
				
			||||||
          </ucap-chat-message-box-file>
 | 
					              *ngSwitchCase="EventType.File"
 | 
				
			||||||
          <ucap-chat-message-box-sticker
 | 
					              [message]="message"
 | 
				
			||||||
            *ngSwitchCase="EventType.Sticker"
 | 
					              (save)="onSave($event)"
 | 
				
			||||||
            [message]="message"
 | 
					              (imageViewer)="onImageViewer($event)"
 | 
				
			||||||
          >
 | 
					            >
 | 
				
			||||||
          </ucap-chat-message-box-sticker>
 | 
					            </ucap-chat-message-box-file>
 | 
				
			||||||
          <ucap-chat-message-box-recall
 | 
					            <ucap-chat-message-box-sticker
 | 
				
			||||||
            *ngSwitchCase="EventType.RecalledMessage"
 | 
					              *ngSwitchCase="EventType.Sticker"
 | 
				
			||||||
          ></ucap-chat-message-box-recall>
 | 
					              [message]="message"
 | 
				
			||||||
          <ucap-chat-message-box-text
 | 
					            >
 | 
				
			||||||
            *ngSwitchCase="EventType.Character"
 | 
					            </ucap-chat-message-box-sticker>
 | 
				
			||||||
            [message]="message"
 | 
					            <ucap-chat-message-box-recall
 | 
				
			||||||
            (contextmenu)="onContextMenuMessage($event, message)"
 | 
					              *ngSwitchCase="EventType.RecalledMessage"
 | 
				
			||||||
          >
 | 
					            ></ucap-chat-message-box-recall>
 | 
				
			||||||
          </ucap-chat-message-box-text>
 | 
					            <ucap-chat-message-box-text
 | 
				
			||||||
          <div *ngSwitchDefault>
 | 
					              *ngSwitchCase="EventType.Character"
 | 
				
			||||||
            mass-translation
 | 
					              [message]="message"
 | 
				
			||||||
            <ucap-chat-message-box-mass-translation></ucap-chat-message-box-mass-translation>
 | 
					              (contextmenu)="onContextMenuMessage($event, message)"
 | 
				
			||||||
            notice
 | 
					            >
 | 
				
			||||||
            <ucap-chat-message-box-notice></ucap-chat-message-box-notice>
 | 
					            </ucap-chat-message-box-text>
 | 
				
			||||||
            <ucap-chat-message-box-schedule></ucap-chat-message-box-schedule>
 | 
					            <div *ngSwitchDefault>
 | 
				
			||||||
            translation
 | 
					              mass-translation
 | 
				
			||||||
            <ucap-chat-message-box-translation></ucap-chat-message-box-translation>
 | 
					              <ucap-chat-message-box-mass-translation></ucap-chat-message-box-mass-translation>
 | 
				
			||||||
            video-conference
 | 
					              notice
 | 
				
			||||||
            <ucap-chat-message-box-video-conference></ucap-chat-message-box-video-conference>
 | 
					              <ucap-chat-message-box-notice></ucap-chat-message-box-notice>
 | 
				
			||||||
 | 
					              <ucap-chat-message-box-schedule></ucap-chat-message-box-schedule>
 | 
				
			||||||
 | 
					              translation
 | 
				
			||||||
 | 
					              <ucap-chat-message-box-translation></ucap-chat-message-box-translation>
 | 
				
			||||||
 | 
					              video-conference
 | 
				
			||||||
 | 
					              <ucap-chat-message-box-video-conference></ucap-chat-message-box-video-conference>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            <div class="message">
 | 
					              <div class="message">
 | 
				
			||||||
              {{ message.sentMessage }}
 | 
					                {{ message.sentMessage }}
 | 
				
			||||||
 | 
					              </div>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
          </div>
 | 
					          </ng-container>
 | 
				
			||||||
        </ng-container>
 | 
					        </div>
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
    </div>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
      <div class="time secondary-text">
 | 
					      <div class="time secondary-text">
 | 
				
			||||||
        {{ message.sendDate | date: 'a hh:mm' }}
 | 
					        {{ message.sendDate | date: 'a hh:mm' }}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user