Commit 4f55aa15 authored by 神楽坂玲奈's avatar 神楽坂玲奈

user-select 优化,修复 Candy 出错后无法切换 App。

parent 05db07a4
...@@ -156,4 +156,7 @@ ...@@ -156,4 +156,7 @@
/*#context-menu {*/ /*#context-menu {*/
/**/ /**/
/*}*/ /*}*/
\ No newline at end of file .message-pane {
-webkit-user-select: auto;
}
\ No newline at end of file
...@@ -28,7 +28,7 @@ import {LoginService} from './login.service'; ...@@ -28,7 +28,7 @@ import {LoginService} from './login.service';
import {SettingsService} from './settings.sevices'; import {SettingsService} from './settings.sevices';
import {App} from './app'; import {App} from './app';
import 'node_modules/candy/libs.min.js'; import 'node_modules/candy/libs.min.js';
import 'node_modules/candy/candy.bundle.js'; import 'node_modules/candy/candy.min.js';
import 'node_modules/candy-shop/notifyme/candy.js'; import 'node_modules/candy-shop/notifyme/candy.js';
import 'node_modules/candy-shop/namecomplete/candy.js'; import 'node_modules/candy-shop/namecomplete/candy.js';
import 'node_modules/candy-shop/modify-role/candy.js'; import 'node_modules/candy-shop/modify-role/candy.js';
...@@ -146,10 +146,14 @@ export class CandyComponent implements OnInit, OnChanges { ...@@ -146,10 +146,14 @@ export class CandyComponent implements OnInit, OnChanges {
} }
conference += '@conference.mycard.moe'; conference += '@conference.mycard.moe';
if (Candy.View.Pane.Chat.rooms[conference]) { try {
Candy.View.Pane.Room.show(conference); if (Candy.View.Pane.Chat.rooms[conference]) {
} else { Candy.View.Pane.Room.show(conference);
Candy.Core.Action.Jabber.Room.Join(conference); } else {
Candy.Core.Action.Jabber.Room.Join(conference);
}
} catch (error) {
} }
} }
} }
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<span i18n *ngIf="grouped_apps.installed">已安装</span> <span i18n *ngIf="grouped_apps.installed">已安装</span>
<ul *ngIf="grouped_apps.installed" class="nav nav-pills flex-column"> <ul *ngIf="grouped_apps.installed" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.installed" class="nav-item"> <li *ngFor="let app of grouped_apps.installed" class="nav-item">
<a (click)="chooseApp(app)" class="nav-link" [class.active]="app===currentApp" href="#"> <a (click)="$event.preventDefault(); chooseApp(app)" class="nav-link" [class.active]="app===currentApp" [href]="'https://mycard.moe/' + app.id">
<!--<img class="icon" src="https://lh3.googleusercontent.com/-crYEtoQ-4Ho/AAAAAAAAAAI/AAAAAAAAAAA/AKB_U8u0CDmxkVqQgOKesrJIb-6eiXacgA/s32-c-mo/photo.jpg">-->{{app.name}}<i *ngIf="!app.isReady() && !app.status.total" class="spin fa fa-circle-o-notch fa-spin fa-fw"></i> <!--<img class="icon" src="https://lh3.googleusercontent.com/-crYEtoQ-4Ho/AAAAAAAAAAI/AAAAAAAAAAA/AKB_U8u0CDmxkVqQgOKesrJIb-6eiXacgA/s32-c-mo/photo.jpg">-->{{app.name}}<i *ngIf="!app.isReady() && !app.status.total" class="spin fa fa-circle-o-notch fa-spin fa-fw"></i>
<div *ngIf="!app.isReady() && app.status.total" class="progress"> <div *ngIf="!app.isReady() && app.status.total" class="progress">
<div class="pie" [class.second-half]="app.status.progress/app.status.total>0.5"> <div class="pie" [class.second-half]="app.status.progress/app.status.total>0.5">
...@@ -25,31 +25,31 @@ ...@@ -25,31 +25,31 @@
<span i18n *ngIf="grouped_apps.recommend">推荐</span> <span i18n *ngIf="grouped_apps.recommend">推荐</span>
<ul *ngIf="grouped_apps.recommend" class="nav nav-pills flex-column"> <ul *ngIf="grouped_apps.recommend" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.recommend" class="nav-item"> <li *ngFor="let app of grouped_apps.recommend" class="nav-item">
<a (click)="chooseApp(app)" href="#" class="nav-link" [class.active]="app===currentApp">{{app.name}}</a> <a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.moe/' + app.id" class="nav-link" [class.active]="app===currentApp">{{app.name}}</a>
</li> </li>
</ul> </ul>
<span i18n *ngIf="grouped_apps.mysterious">迷之物体</span> <span i18n *ngIf="grouped_apps.mysterious">迷之物体</span>
<ul *ngIf="grouped_apps.mysterious" class="nav nav-pills flex-column"> <ul *ngIf="grouped_apps.mysterious" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.mysterious" class="nav-item"> <li *ngFor="let app of grouped_apps.mysterious" class="nav-item">
<a (click)="chooseApp(app)" href="#" class="nav-link" [class.active]="app===currentApp">{{app.name}}</a> <a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.moe/' + app.id" class="nav-link" [class.active]="app===currentApp">{{app.name}}</a>
</li> </li>
</ul> </ul>
<span i18n *ngIf="grouped_apps.touhou">东方 Project</span> <span i18n *ngIf="grouped_apps.touhou">东方 Project</span>
<ul *ngIf="grouped_apps.touhou" class="nav nav-pills flex-column"> <ul *ngIf="grouped_apps.touhou" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.touhou" class="nav-item"> <li *ngFor="let app of grouped_apps.touhou" class="nav-item">
<a (click)="chooseApp(app)" href="#" class="nav-link" [class.active]="app===currentApp">{{app.name}}</a> <a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.moe/' + app.id" class="nav-link" [class.active]="app===currentApp">{{app.name}}</a>
</li> </li>
</ul> </ul>
<span i18n *ngIf="grouped_apps.touhou_pc98">东方旧作</span> <span i18n *ngIf="grouped_apps.touhou_pc98">东方旧作</span>
<ul *ngIf="grouped_apps.touhou_pc98" class="nav nav-pills flex-column"> <ul *ngIf="grouped_apps.touhou_pc98" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.touhou_pc98" class="nav-item"> <li *ngFor="let app of grouped_apps.touhou_pc98" class="nav-item">
<a (click)="chooseApp(app)" href="#" class="nav-link" [class.active]="app===currentApp">{{app.name}}</a> <a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.moe/' + app.id" class="nav-link" [class.active]="app===currentApp">{{app.name}}</a>
</li> </li>
</ul> </ul>
<span i18n *ngIf="grouped_apps.runtime_installed">已安装的运行库</span> <span i18n *ngIf="grouped_apps.runtime_installed">已安装的运行库</span>
<ul *ngIf="grouped_apps.runtime_installed" class="nav nav-pills flex-column"> <ul *ngIf="grouped_apps.runtime_installed" class="nav nav-pills flex-column">
<li *ngFor="let app of grouped_apps.runtime_installed" class="nav-item"> <li *ngFor="let app of grouped_apps.runtime_installed" class="nav-item">
<a (click)="chooseApp(app)" href="#" class="nav-link" [class.active]="app===currentApp">{{app.name}}</a> <a (click)="$event.preventDefault(); chooseApp(app)" [href]="'https://mycard.moe/' + app.id" class="nav-link" [class.active]="app===currentApp">{{app.name}}</a>
</li> </li>
</ul> </ul>
</nav> </nav>
......
...@@ -85,12 +85,14 @@ export class LobbyComponent implements OnInit { ...@@ -85,12 +85,14 @@ export class LobbyComponent implements OnInit {
} }
}); });
document.addEventListener('mouseup', (event: MouseEvent) => { document.addEventListener('mouseup', (event: MouseEvent) => {
document.body.classList.remove('resizing');
this.resizing = undefined; this.resizing = undefined;
}); });
} }
mousedown (event: MouseEvent) { mousedown (event: MouseEvent) {
// console.log(() // console.log(()
document.body.classList.add('resizing');
this.resizing = <HTMLElement>(<HTMLElement>event.target).parentNode; this.resizing = <HTMLElement>(<HTMLElement>event.target).parentNode;
if (this.resizing.classList.contains('resize-right')) { if (this.resizing.classList.contains('resize-right')) {
this.offset = this.resizing.offsetWidth - event.clientX; this.offset = this.resizing.offsetWidth - event.clientX;
......
...@@ -41,6 +41,11 @@ export class MyCardComponent implements OnInit { ...@@ -41,6 +41,11 @@ export class MyCardComponent implements OnInit {
'update-available': this.update_available, 'update-available': this.update_available,
'update-downloaded': this.update_downloaded 'update-downloaded': this.update_downloaded
})); }));
// document.addEventListener('drop', (event)=>{
// console.log('drop', event);
// event.preventDefault();
//
// });
} }
constructor (private renderer: Renderer, private loginService: LoginService, private ref: ChangeDetectorRef, constructor (private renderer: Renderer, private loginService: LoginService, private ref: ChangeDetectorRef,
......
...@@ -80,3 +80,11 @@ mycard { ...@@ -80,3 +80,11 @@ mycard {
overflow-y: auto; overflow-y: auto;
} }
body.resizing /deep/ * {
-webkit-user-select: none;
}
body {
-webkit-user-select: none;
}
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