Skip to content

M
mycard
Commit ce4419cd authored by 2breakegg's avatar 2breakegg
Browse files
Options

游戏描述 聊天title 改写聊天窗口最大化,最小化,还原代码

parent fde26724
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 89 deletions
app/app-detail.component.html
View file @ ce4419cd
...@@ -74,8 +74,7 @@ ...@@ -74,8 +74,7 @@
<div class="d-flex"> <div class="d-flex">
<div class="panel" id="game_info"> <div class="panel" id="game_info">
<p> <p [innerHTML]="currentApp.description"></p>
《东方红魔乡 ～ the Embodiment of Scarlet Devil.》（东方红魔郷 ～ the Embodiment of Scarlet Devil.）是由同人组织上海爱丽丝幻乐团所制作的纵弹幕射击游戏，于2002年6月10日发布体验版，2002年8月11日（Comic Market62）正式发售，9月27日在各同人商店开始了委托贩卖。该作是东方Project的第6作，也是东方Project在Windows平台上的第一作。 </p>
<div id="tags"> <div id="tags">
<div class="btn btn-xs btn-danger" style="padding:3px 10px; margin:2px">弹幕</div> <div class="btn btn-xs btn-danger" style="padding:3px 10px; margin:2px">弹幕</div>
<div class="btn btn-xs btn-danger" style="padding:3px 10px; margin:2px">射击</div> <div class="btn btn-xs btn-danger" style="padding:3px 10px; margin:2px">射击</div>
......
app/candy.component.html
View file @ ce4419cd
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
</div> </div>
<div style="position:absolute; top:5px; right:10px;"> <div style="position:absolute; top:5px; right:10px;">
<i id="minimized" class="fa fa-minus hover-color" (click)="minimized()" data-size=""></i> <i id="minimized" class="fa fa-minus hover-color" (click)="minimized()" data-size="" title="最小化"></i>
<i id="maximized" class="fa fa-expand hover-color" (click)="maximized()" onclick=""></i> <i id="restore" class="fa fa-clone hover-color" (click)="restore()" data-size="" title="还原" hidden></i>
<i id="maximized" class="fa fa-expand hover-color" (click)="maximized()" onclick="" title="最大化"></i>
</div> </div>
\ No newline at end of file
app/candy.component.ts
View file @ ce4419cd
...@@ -221,7 +221,7 @@ export class CandyComponent implements OnInit, OnChanges { ...@@ -221,7 +221,7 @@ export class CandyComponent implements OnInit, OnChanges {
nickname: string; nickname: string;
// ismin_window:Boolean=false; // ismin_window:Boolean=false;
// ismax_window:Boolean=false; // ismax_window:Boolean=false;
height_default_window:string="230px"; height_default_window: string = '230px';
constructor(private loginService: LoginService, private settingsService: SettingsService, private element: ElementRef) { constructor(private loginService: LoginService, private settingsService: SettingsService, private element: ElementRef) {
} }
...@@ -314,56 +314,51 @@ export class CandyComponent implements OnInit, OnChanges { ...@@ -314,56 +314,51 @@ export class CandyComponent implements OnInit, OnChanges {
} }
} }
minimized():void{ minimized(): void {
let minimized:HTMLElement = $('#minimized')[0]; // let minimized:HTMLElement = $('#minimized')[0];
let maximized:HTMLElement = $('#maximized')[0]; // let maximized:HTMLElement = $('#maximized')[0];
if($('#candy').attr('data-minormax')!='min'){ // let un_minimized:HTMLElement = $('#un_minimized')[0];
$('#candy').attr('data-minormax','min'); // let un_maximized:HTMLElement = $('#un_maximized')[0];
document.getElementById('candy-wrapper')!.style.height='31px'; $('#candy').attr('data-minormax', 'min');
$('#mobile-roster-icon').css('display','none'); document.getElementById('candy-wrapper')!.style.height = '31px';
$('#chat-toolbar').css('display','none'); $('#mobile-roster-icon').css('display', 'none');
$('#chat-rooms').css('display','none'); $('#chat-toolbar').css('display', 'none');
$('#context-menu').css('display','none'); $('#chat-rooms').css('display', 'none');
$('#mobile-roster-icon').css('display','none'); $('#context-menu').css('display', 'none');
$(minimized).addClass('fa-clone'); $('#mobile-roster-icon').css('display', 'none');
$(minimized).removeClass('fa-minus');
$(maximized).removeClass('fa-clone'); $('#minimized').hide();
$(maximized).addClass('fa-expand'); $('#restore').show();
}else{ $('#maximized').show();
$('#candy').attr('data-minormax','default'); }
document.getElementById('candy-wrapper')!.style!.height=this.height_default_window; restore(): void {
$('#mobile-roster-icon').css('display','block'); $('#candy').attr('data-minormax', 'default');
$('#chat-toolbar').css('display','block'); document.getElementById('candy-wrapper')!.style!.height = this.height_default_window;
$('#chat-rooms').css('display','block'); $('#mobile-roster-icon').css('display', 'block');
$('#context-menu').css('display','block'); $('#chat-toolbar').css('display', 'block');
$('#mobile-roster-icon').css('display','block'); $('#chat-rooms').css('display', 'block');
$(minimized).removeClass('fa-clone'); $('#context-menu').css('display', 'block');
$(minimized).addClass('fa-minus'); $('#mobile-roster-icon').css('display', 'block');
}
$('#minimized').show();
$('#restore').hide();
$('#maximized').show();
} }
maximized():void{ maximized(): void {
let minimized:HTMLElement = $('#minimized')[0]; $('#candy').attr('data-minormax', 'max');
let maximized:HTMLElement = $('#maximized')[0]; document.getElementById('candy-wrapper')!.style!.height = 'calc( 100% - 180px )' ;
if($('#candy').attr('data-minormax')!='max'){ $('#mobile-roster-icon').css('display', 'block');
$('#candy').attr('data-minormax','max'); $('#chat-toolbar').css('display', 'block');
document.getElementById('candy-wrapper')!.style!.height="calc( 100% - 180px )"; $('#chat-rooms').css('display', 'block');
$('#mobile-roster-icon').css('display','block'); $('#context-menu').css('display', 'block');
$('#chat-toolbar').css('display','block'); $('#mobile-roster-icon').css('display', 'block');
$('#chat-rooms').css('display','block');
$('#context-menu').css('display','block'); $('#minimized').show();
$('#mobile-roster-icon').css('display','block'); $('#restore').show();
$(minimized).removeClass('fa-clone'); $('#maximized').hide();
$(minimized).addClass('fa-minus');
$(maximized).removeClass('fa-expand');
$(maximized).addClass('fa-clone');
}else{
$('#candy').attr('data-minormax','default');
$(maximized).removeClass('fa-clone');
$(maximized).addClass('fa-expand');
document.getElementById('candy-wrapper')!.style!.height=this.height_default_window;
}
} }
} }
......
app/lobby.component.ts
View file @ ce4419cd
...@@ -50,7 +50,7 @@ export class LobbyComponent implements OnInit { ...@@ -50,7 +50,7 @@ export class LobbyComponent implements OnInit {
} }
// 特化个 YGOPRO 国际服聊天室。其他的暂时没需求。 // 特化个 YGOPRO 国际服聊天室。其他的暂时没需求。
if (!this.settingsService.getLocale().startsWith('zh')) { if (!this.settingsService.getLocale().startsWith('zh')) {
this.apps.get('ygopro')!.conference = 'ygopro-international' this.apps.get('ygopro')!.conference = 'ygopro-international';
} }
this.ref.detectChanges(); this.ref.detectChanges();
...@@ -85,47 +85,41 @@ export class LobbyComponent implements OnInit { ...@@ -85,47 +85,41 @@ export class LobbyComponent implements OnInit {
this.resizing.style.width = `${width}px`; this.resizing.style.width = `${width}px`;
} else { } else {
let height = this.offset - event.clientY; let height = this.offset - event.clientY;
let main_height=event.clientY-document.getElementById('navbar')!.clientHeight; let main_height = event.clientY - document.getElementById('navbar')!.clientHeight;
let minimized: HTMLElement = $('#minimized')[0];
let maximized: HTMLElement = $('#maximized')[0];
console.log(event.clientY); console.log(event.clientY);
if (height > 150 && main_height>180) { if (height > 150 && main_height > 180) {
if (height < 230) { if (height < 230) {
height = 230; height = 230;
} }
this.resizing.style.height = `${height}px`; this.resizing.style.height = `${height}px`;
if($('#candy').attr('data-minormax')!='default') { if ( $('#candy').attr('data-minormax') !== 'default') {
$('#candy').attr('data-minormax', 'default'); $('#candy').attr('data-minormax', 'default');
$('#mobile-roster-icon').css('display', 'block'); $('#mobile-roster-icon').css('display', 'block');
$('#chat-toolbar').css('display', 'block'); $('#chat-toolbar').css('display', 'block');
$('#chat-rooms').css('display', 'block'); $('#chat-rooms').css('display', 'block');
$('#context-menu').css('display', 'block'); $('#context-menu').css('display', 'block');
$('#mobile-roster-icon').css('display', 'block'); $('#mobile-roster-icon').css('display', 'block');
$(minimized).removeClass('fa-clone'); $('#minimized').show();
$(minimized).addClass('fa-minus'); $('#restore').hide();
$(maximized).removeClass('fa-clone'); $('#maximized').show();
$(maximized).addClass('fa-expand');
} }
}else if(height<=150){ }else if ( height <= 150) {
$('#candy').attr('data-minormax','min'); $('#candy').attr('data-minormax', 'min');
this.resizing.style.height='31px'; this.resizing.style.height = '31px';
$('#mobile-roster-icon').css('display','none'); $('#mobile-roster-icon').css('display', 'none');
$('#chat-toolbar').css('display','none'); $('#chat-toolbar').css('display', 'none');
$('#chat-rooms').css('display','none'); $('#chat-rooms').css('display', 'none');
$('#context-menu').css('display','none'); $('#context-menu').css('display', 'none');
$('#mobile-roster-icon').css('display','none'); $('#mobile-roster-icon').css('display', 'none');
$(minimized).addClass('fa-clone'); $('#minimized').hide();
$(minimized).removeClass('fa-minus'); $('#restore').show();
$(maximized).removeClass('fa-clone'); $('#maximized').show();
$(maximized).addClass('fa-expand'); }else if ( main_height <= 180) {
}else if(main_height<=180){ $('#candy').attr('data-minormax', 'max');
$('#candy').attr('data-minormax','max'); this.resizing.style.height = 'calc( 100% - 180px )';
this.resizing.style.height='calc( 100% - 180px )'; $('#minimized').show();
$(minimized).removeClass('fa-clone'); $('#restore').show();
$(minimized).addClass('fa-minus'); $('#maximized').hide();
$(maximized).removeClass('fa-expand');
$(maximized).addClass('fa-clone');
} }
} }
}); });
......
app/mycard.component.html
View file @ ce4419cd
...@@ -32,15 +32,15 @@ ...@@ -32,15 +32,15 @@
<div id="user" *ngIf="loginService.logged_in"> <div id="user" *ngIf="loginService.logged_in">
<a href="#" class="profile"><img id="avatar" [src]="loginService.user.avatar_url" alt="image"></a> <a href="#" class="profile"><img id="avatar" [src]="loginService.user.avatar_url" alt="image"></a>
<a href="#" class="profile item" id="username">{{loginService.user.username}}</a> <a href="#" class="profile item" id="username">{{loginService.user.username}}</a>
<i (click)="loginService.logout()" class="fa fa-sign-out item-icon" aria-hidden="true"></i> <i i18n (click)="loginService.logout()" class="fa fa-sign-out item-icon" aria-hidden="true" title="登出"></i>
<i data-toggle="modal" data-target="#settings-modal" class="fa fa-cog item-icon" aria-hidden="true"></i> <i i18n data-toggle="modal" data-target="#settings-modal" class="fa fa-cog item-icon" aria-hidden="true" title="设置"></i>
</div> </div>
<div id="border">|</div> <div id="border">|</div>
<div id="window-buttons"> <div id="window-buttons">
<i (click)="currentWindow.minimize()" class="fa fa-minus"></i> <i i18n (click)="currentWindow.minimize()" class="fa fa-minus" title="最小化"></i>
<i *ngIf="!currentWindow.isMaximized()" (click)="currentWindow.maximize()" class="fa fa-expand"></i> <i i18n *ngIf="!currentWindow.isMaximized()" (click)="currentWindow.maximize()" class="fa fa-expand" title="最大化"></i>
<i *ngIf="currentWindow.isMaximized()" (click)="currentWindow.unmaximize()" class="fa fa-clone"></i> <i i18n *ngIf="currentWindow.isMaximized()" (click)="currentWindow.unmaximize()" class="fa fa-clone" title="还原"></i>
<i (click)="currentWindow.hide()" class="fa fa-times"></i> <i i18n (click)="currentWindow.hide()" class="fa fa-times" title="关闭"></i>
</div> </div>
</div> </div>
</nav> </nav>
......
app/roster.component.html
View file @ ce4419cd
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<!--<script src="../systemjs.config.js"></script>--> <!--<script src="../systemjs.config.js"></script>-->
<div > <div>
<div class="input-group" id="friend_search"> <div class="input-group" id="friend_search">
<div class="input-group "> <div class="input-group ">
<i class="fa fa-search input-group-addon search" id="basic-addon1"></i> <i class="fa fa-search input-group-addon search" id="basic-addon1"></i>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment