Commit 9e9d8225 authored by 神楽坂玲奈's avatar 神楽坂玲奈

微调

parent 2eb5e626
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { LobbyComponent } from './lobby/lobby.component';
import { CubeDetailComponent } from './cube-detail/cube-detail.component';
import { LoginComponent } from './login/login.component';
import { AuthGuard } from './auth.guard'; import { AuthGuard } from './auth.guard';
import { CommunityComponent } from './community/community.component'; import { CommunityComponent } from './community/community.component';
import { CubeDetailComponent } from './cube-detail/cube-detail.component';
import { LoadingGuard } from './loading.guard'; import { LoadingGuard } from './loading.guard';
import { LobbyComponent } from './lobby/lobby.component';
import { LoginComponent } from './login/login.component';
import { ProfileComponent } from './profile/profile.component'; import { ProfileComponent } from './profile/profile.component';
const routes: Routes = [ const routes: Routes = [
......
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpModule } from '@angular/http'; import { HttpModule } from '@angular/http';
import { MoeCubeComponent } from './moecube/moecube.component'; import { BrowserModule } from '@angular/platform-browser';
import { LoginComponent } from './login/login.component'; import { ELECTRON_SCHEMA } from 'electron-schema';
import { LobbyComponent } from './lobby/lobby.component';
import { CubeDetailComponent } from './cube-detail/cube-detail.component';
import { RosterComponent } from './roster/roster.component';
import { YGOProComponent } from './ygopro/ygopro.component';
import { CandyComponent } from './candy/candy.component'; import { CandyComponent } from './candy/candy.component';
import { CubesService } from './cubes.service';
import { SettingsService } from './settings.sevices';
import { LoginService } from './login.service';
import { DownloadService } from './download.service';
import { ProgressSpinnerComponent } from './progress-spinner/progress-spinner.component';
import { CommunityComponent } from './community/community.component'; import { CommunityComponent } from './community/community.component';
import { UpdateComponent } from './update/update.component'; import { CubeAchievementsComponent } from './cube-achievements/cube-achievements.component';
import { WindowControlComponent } from './window-control/window-control.component';
import { CubeActionsComponent } from './cube-actions/cube-actions.component'; import { CubeActionsComponent } from './cube-actions/cube-actions.component';
import { CubeArenaComponent } from './cube-arena/cube-arena.component'; import { CubeArenaComponent } from './cube-arena/cube-arena.component';
import { CubeDescriptionComponent } from './cube-description/cube-description.component'; import { CubeDescriptionComponent } from './cube-description/cube-description.component';
import { CubeNewsComponent } from './cube-news/cube-news.component'; import { CubeDetailComponent } from './cube-detail/cube-detail.component';
import { CubeExpansionsComponent } from './cube-expansions/cube-expansions.component'; import { CubeExpansionsComponent } from './cube-expansions/cube-expansions.component';
import { ProgressBarComponent } from './progress-bar/progress-bar.component'; import { CubeNewsComponent } from './cube-news/cube-news.component';
import { ELECTRON_SCHEMA } from 'electron-schema'; import { CubesService } from './cubes.service';
import { DownloadService } from './download.service';
import { LobbyComponent } from './lobby/lobby.component';
import { LoginService } from './login.service';
import { LoginComponent } from './login/login.component';
import { MaotamaComponent } from './maotama/maotama.component'; import { MaotamaComponent } from './maotama/maotama.component';
import { MoeCubeComponent } from './moecube/moecube.component';
import { ProfileComponent } from './profile/profile.component'; import { ProfileComponent } from './profile/profile.component';
import { ProgressBarComponent } from './progress-bar/progress-bar.component';
import { ProgressSpinnerComponent } from './progress-spinner/progress-spinner.component';
import { RosterComponent } from './roster/roster.component';
import { RoutingService } from './routing.sevices'; import { RoutingService } from './routing.sevices';
import { CubeAchievementsComponent } from './cube-achievements/cube-achievements.component'; import { SettingsService } from './settings.sevices';
import { UpdateComponent } from './update/update.component';
import { WindowControlComponent } from './window-control/window-control.component';
import { YGOProComponent } from './ygopro/ygopro.component';
@NgModule({ @NgModule({
imports: [BrowserModule, FormsModule, ReactiveFormsModule, HttpModule], imports: [BrowserModule, FormsModule, ReactiveFormsModule, HttpModule],
......
...@@ -3,9 +3,7 @@ ...@@ -3,9 +3,7 @@
</div> </div>
<div style="position:absolute; top:5px; right:10px;"> <div style="position:absolute; top:5px; right:10px;">
<i id="minimize" class="fa fa-minus hover-color" (click)="minimize()" data-size="" i18n-title title="最小化"></i> <i id="minimize" class="fa fa-minus hover-color" (click)="minimize()" data-size="" i18n-title title="最小化"></i>
<i id="unminimize" class="fa fa-minus hover-color" (click)="restore()" data-size="" i18n-title title="取消最小化" <i id="unminimize" class="fa fa-minus hover-color" (click)="restore()" data-size="" i18n-title title="取消最小化" hidden></i>
hidden></i> <i id="restore" class="fa fa fa-chevron-down hover-color" (click)="restore()" data-size="" i18n-title title="还原" hidden></i>
<i id="restore" class="fa fa fa-chevron-down hover-color" (click)="restore()" data-size="" i18n-title title="还原"
hidden></i>
<i id="maximize" class="fa fa fa-chevron-up hover-color" (click)="maximize()" i18n-title title="最大化"></i> <i id="maximize" class="fa fa fa-chevron-up hover-color" (click)="maximize()" i18n-title title="最大化"></i>
</div> </div>
import { Cube } from '../cube';
import { Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core';
import 'node_modules/candy/libs.min.js';
import 'node_modules/candy/candy.min.js';
import 'node_modules/candy-shop/notifyme/candy.js';
import 'node_modules/candy-shop/namecomplete/candy.js';
import 'node_modules/candy-shop/modify-role/candy.js';
import 'node_modules/candy-shop/me-does/candy.js'; import 'node_modules/candy-shop/me-does/candy.js';
import 'node_modules/candy-shop/modify-role/candy.js';
import 'node_modules/candy-shop/namecomplete/candy.js';
import 'node_modules/candy-shop/notifications/candy.js'; import 'node_modules/candy-shop/notifications/candy.js';
import 'node_modules/candy-shop/notifyme/candy.js';
import 'node_modules/candy-shop/refocus/candy.js'; import 'node_modules/candy-shop/refocus/candy.js';
import 'node_modules/candy/candy.min.js';
import 'node_modules/candy/libs.min.js';
import * as uuid from 'uuid';
import { Cube } from '../cube';
import { LoginService } from '../login.service'; import { LoginService } from '../login.service';
import { SettingsService } from '../settings.sevices'; import { SettingsService } from '../settings.sevices';
import * as uuid from 'uuid';
// import * as jqueryShadow from '../../jquery-shadow.js'; // import * as jqueryShadow from '../../jquery-shadow.js';
// import 'electron-cookies'; // import 'electron-cookies';
/** /**
......
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
* Created by zh99998 on 16/9/2. * Created by zh99998 on 16/9/2.
*/ */
import { ChangeDetectorRef, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; import { ChangeDetectorRef, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
import { Cube, InstallOption } from '../cube';
import { CubesService } from '../cubes.service';
import { SettingsService } from '../settings.sevices';
import { LoginService } from '../login.service';
import { DownloadService } from '../download.service';
import { Http } from '@angular/http'; import { Http } from '@angular/http';
import * as fs from 'fs'; import 'bootstrap';
import * as path from 'path';
import { remote } from 'electron'; import { remote } from 'electron';
import * as fs from 'fs';
import * as $ from 'jquery'; import * as $ from 'jquery';
import 'bootstrap'; import * as path from 'path';
import { Cube, InstallOption } from '../cube';
import { CubesService } from '../cubes.service';
import { DownloadService } from '../download.service';
import { LoginService } from '../login.service';
import { SettingsService } from '../settings.sevices';
@Component({ @Component({
......
...@@ -42,5 +42,4 @@ ...@@ -42,5 +42,4 @@
<td>{{points.entertain_all}}</td> <td>{{points.entertain_all}}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table><a i18n href="https://moecube.com/ygopro/arena/" target="_blank" class="moreinfo">更多资料</a>
<a i18n href="https://moecube.com/ygopro/arena/" target="_blank" class="moreinfo">更多资料</a>
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
*/ */
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
import { Http } from '@angular/http'; import { Http } from '@angular/http';
import { LoginService } from '../login.service';
import { Cube } from '../cube'; import { Cube } from '../cube';
import { LoginService } from '../login.service';
export interface Points { export interface Points {
exp: number; exp: number;
......
...@@ -20,7 +20,7 @@ div { ...@@ -20,7 +20,7 @@ div {
} }
.right-box{ .right-box {
} }
...@@ -85,9 +85,9 @@ img { ...@@ -85,9 +85,9 @@ img {
background: url('http://2breakegg.github.io/image/select.png'); background: url('http://2breakegg.github.io/image/select.png');
} }
.icon_play{ .icon_play {
border-radius: 5px; border-radius: 5px;
background: rgba(255,255,255,0.7); background: rgba(255, 255, 255, 0.7);
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
...@@ -99,6 +99,7 @@ img { ...@@ -99,6 +99,7 @@ img {
padding: 5px; padding: 5px;
box-sizing: initial; box-sizing: initial;
} }
/*#left {*/ /*#left {*/
/*font-size: 14px;*/ /*font-size: 14px;*/
/*margin-right: 8px;*/ /*margin-right: 8px;*/
......
/** /**
* Created by zh99998 on 16/9/2. * Created by zh99998 on 16/9/2.
*/ */
import {Component, Input, OnChanges, SimpleChanges} from '@angular/core'; import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
import {Cube} from '../cube'; import { Cube } from '../cube';
import Timer = NodeJS.Timer; import Timer = NodeJS.Timer;
...@@ -67,13 +67,13 @@ export class CubeDescriptionComponent implements OnChanges { ...@@ -67,13 +67,13 @@ export class CubeDescriptionComponent implements OnChanges {
console.log('nextpic' + key); console.log('nextpic' + key);
if (this.carouselLock) { if (this.carouselLock) {
this.timeOutId = setTimeout(function () { this.timeOutId = setTimeout(function () {
that.nextpic(key) that.nextpic(key);
}, this.carouselTime); }, this.carouselTime);
} else { } else {
key = this.divOpacity.length > key + 1 ? key : this.videosrc.length - 1; key = this.divOpacity.length > key + 1 ? key : this.videosrc.length - 1;
this.appear(key + 1); this.appear(key + 1);
this.timeOutId = setTimeout(function () { this.timeOutId = setTimeout(function () {
that.nextpic(key + 1) that.nextpic(key + 1);
}, this.carouselTime); }, this.carouselTime);
} }
} }
...@@ -84,7 +84,7 @@ export class CubeDescriptionComponent implements OnChanges { ...@@ -84,7 +84,7 @@ export class CubeDescriptionComponent implements OnChanges {
this.selectId = key; this.selectId = key;
divOpacity.map(function (val, key2) { divOpacity.map(function (val, key2) {
divOpacity[key2] = 0; divOpacity[key2] = 0;
}) });
divOpacity[key] = 1; divOpacity[key] = 1;
} }
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
} }
/*h2 {*/ /*h2 {*/
/*font-size: 20px;*/ /*font-size: 20px;*/
/*margin-bottom: 0;*/ /*margin-bottom: 0;*/
/*}*/ /*}*/
#local h2 { #local h2 {
...@@ -32,7 +32,6 @@ th { ...@@ -32,7 +32,6 @@ th {
width: 25%; width: 25%;
} }
#purchase-form .form-check { #purchase-form .form-check {
padding-right: 8px; padding-right: 8px;
} }
......
import { ChangeDetectorRef, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core'; import { ChangeDetectorRef, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
import { Http, URLSearchParams } from '@angular/http';
import { clipboard, remote } from 'electron'; import { clipboard, remote } from 'electron';
import * as path from 'path';
import * as fs from 'fs'; import * as fs from 'fs';
import * as $ from 'jquery'; import * as $ from 'jquery';
import { Http, URLSearchParams } from '@angular/http'; import * as path from 'path';
import { Cube, InstallOption } from '../cube'; import { Cube, InstallOption } from '../cube';
import { CubesService } from '../cubes.service'; import { CubesService } from '../cubes.service';
import { SettingsService } from '../settings.sevices';
import { DownloadService } from '../download.service'; import { DownloadService } from '../download.service';
import { LoginService } from '../login.service'; import { LoginService } from '../login.service';
import { SettingsService } from '../settings.sevices';
declare const Notification: any; declare const Notification: any;
......
...@@ -4,5 +4,4 @@ ...@@ -4,5 +4,4 @@
<span>{{item.updated_at | date:'shortDate'}}</span> <span>{{item.updated_at | date:'shortDate'}}</span>
<p>{{item.text}}</p> <p>{{item.text}}</p>
<a i18n *ngIf="item.url" [href]="item.url" target="_blank">了解更多</a> <a i18n *ngIf="item.url" [href]="item.url" target="_blank">了解更多</a>
</div> </div><!--<a href="https://moecube.com/ygopro/arena/" target="_blank" class="moreinfo">查看所有新闻</a>-->
<!--<a href="https://moecube.com/ygopro/arena/" target="_blank" class="moreinfo">查看所有新闻</a>-->
import { ApplicationRef, EventEmitter, Injectable, NgZone } from '@angular/core'; import { ApplicationRef, EventEmitter, Injectable, NgZone } from '@angular/core';
import { Http, URLSearchParams } from '@angular/http'; import { Http, URLSearchParams } from '@angular/http';
import * as crypto from 'crypto';
import { Action, AppStatus, Cube, CubeLocal, InstallOption } from './cube';
import { SettingsService } from './settings.sevices';
import * as fs from 'fs';
import { createReadStream, createWriteStream } from 'fs';
import * as path from 'path';
import * as child_process from 'child_process'; import * as child_process from 'child_process';
import { ChildProcess } from 'child_process'; import { ChildProcess } from 'child_process';
import * as crypto from 'crypto';
import { remote } from 'electron'; import { remote } from 'electron';
import 'rxjs/Rx'; import * as fs from 'fs';
import * as readline from 'readline'; import { createReadStream, createWriteStream } from 'fs';
import * as glob from 'glob'; import * as glob from 'glob';
import * as ini from 'ini'; import * as ini from 'ini';
import { DownloadService, DownloadStatus } from './download.service'; import * as path from 'path';
import * as readline from 'readline';
import 'rxjs/Rx';
import { Observable, Observer } from 'rxjs/Rx'; import { Observable, Observer } from 'rxjs/Rx';
import { Action, AppStatus, Cube, CubeLocal, InstallOption } from './cube';
import { DownloadService, DownloadStatus } from './download.service';
import { LoginService } from './login.service'; import { LoginService } from './login.service';
import { SettingsService } from './settings.sevices';
import Timer = NodeJS.Timer; import Timer = NodeJS.Timer;
import ReadableStream = NodeJS.ReadableStream import ReadableStream = NodeJS.ReadableStream
......
...@@ -59,8 +59,6 @@ span { ...@@ -59,8 +59,6 @@ span {
margin-bottom: 1em; margin-bottom: 1em;
} }
.second-half { .second-half {
clip: rect(auto, auto, auto, auto); clip: rect(auto, auto, auto, auto);
} }
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
*/ */
import { ChangeDetectorRef, Component, ElementRef, OnInit, ViewChild } from '@angular/core'; import { ChangeDetectorRef, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { URLSearchParams } from '@angular/http'; import { URLSearchParams } from '@angular/http';
import * as ReconnectingWebSocket from 'reconnecting-websocket';
import { Category, Cube } from '../cube'; import { Category, Cube } from '../cube';
import { CubesService } from '../cubes.service'; import { CubesService } from '../cubes.service';
import { LoginService } from '../login.service'; import { LoginService } from '../login.service';
import { SettingsService } from '../settings.sevices'; import { SettingsService } from '../settings.sevices';
import * as ReconnectingWebSocket from 'reconnecting-websocket';
// import 'typeahead.js'; // import 'typeahead.js';
// import Options = Twitter.Typeahead.Options; // import Options = Twitter.Typeahead.Options;
......
...@@ -5,7 +5,6 @@ import { Component, OnInit } from '@angular/core'; ...@@ -5,7 +5,6 @@ import { Component, OnInit } from '@angular/core';
import * as crypto from 'crypto'; import * as crypto from 'crypto';
import { shell } from 'electron'; import { shell } from 'electron';
import { LoginService } from '../login.service'; import { LoginService } from '../login.service';
import { Router } from '@angular/router';
@Component({ @Component({
selector: 'webview[login]', selector: 'webview[login]',
......
...@@ -3,5 +3,4 @@ ...@@ -3,5 +3,4 @@
</ng-template> </ng-template>
<!--<div clavalueress">--> <!--<div clavalueress">-->
<div *ngIf="value; else indeterminate" class="progress-bar" role="progressbar" [style.width]="value * 100 + '%'"></div> <div *ngIf="value; else indeterminate" class="progress-bar" role="progressbar" [style.width]="value * 100 + '%'"></div><!--</div>-->
<!--</div>-->
...@@ -5,69 +5,15 @@ ...@@ -5,69 +5,15 @@
<!--<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 ">--><!--<i class="fa fa-search input-group-addon search" id="basic-addon1"></i>--><!--<input type="text" class="form-control" aria-label="Amount (to the nearest dollar)">--><!--&lt;!&ndash;<span class="input-group-addon">+</span>&ndash;&gt;--><!--<button type="button" class="input-group-addon btn btn-sm btn-primary blue_light">+</button>--><!--</div>--><!--</div>-->
<!--<div class="input-group" id="friend_search">-->
<!--<div class="input-group ">-->
<!--<i class="fa fa-search input-group-addon search" id="basic-addon1"></i>-->
<!--<input type="text" class="form-control" aria-label="Amount (to the nearest dollar)">-->
<!--&lt;!&ndash;<span class="input-group-addon">+</span>&ndash;&gt;-->
<!--<button type="button" class="input-group-addon btn btn-sm btn-primary blue_light">+</button>-->
<!--</div>-->
<!--</div>-->
<!--<div id="friend_list">--> <!--<div id="friend_list">--><!--<ul>--><!--<li *ngFor="let contact of roster">--><!--<img class="fl" src="https://ygobbs.com//letter_avatar_proxy/v2/letter/q/cdc98d/45.png">--><!--<i class="fa fa-circle green_light"></i>--><!--<div class="fl">--><!--<p>{{contact.getName()}}</p>--><!--<p *ngIf="contact.getSubscription() != 'both'">等待确认</p>--><!--<p *ngIf="contact.getSubscription() == 'both'">{{contact.getStatus()}}</p>-->
<!--<ul>-->
<!--<li *ngFor="let contact of roster">-->
<!--<img class="fl" src="https://ygobbs.com//letter_avatar_proxy/v2/letter/q/cdc98d/45.png">-->
<!--<i class="fa fa-circle green_light"></i>-->
<!--<div class="fl">-->
<!--<p>{{contact.getName()}}</p>-->
<!--<p *ngIf="contact.getSubscription() != 'both'">等待确认</p>-->
<!--<p *ngIf="contact.getSubscription() == 'both'">{{contact.getStatus()}}</p>-->
<!--</div>--> <!--</div>--><!--<div style="clear: both"></div>--><!--</li>--><!--<li>--><!--<img class="fl" src="https://ygobbs.com//letter_avatar_proxy/v2/letter/q/cdc98d/45.png">--><!--<i class="fa fa-circle green_light"></i>--><!--<div class="fl">--><!--<p>我叫什么名来着</p>--><!--<p>发呆ing</p>--><!--</div>--><!--<div style="clear: both"></div>--><!--</li>-->
<!--<div style="clear: both"></div>-->
<!--</li>-->
<!--<li>-->
<!--<img class="fl" src="https://ygobbs.com//letter_avatar_proxy/v2/letter/q/cdc98d/45.png">-->
<!--<i class="fa fa-circle green_light"></i>-->
<!--<div class="fl">-->
<!--<p>我叫什么名来着</p>-->
<!--<p>发呆ing</p>-->
<!--</div>-->
<!--<div style="clear: both"></div>-->
<!--</li>-->
<!--<li>--> <!--<li>--><!--<img class="fl" src="https://ygobbs.com/user_avatar/ygobbs.com/sky%E7%A5%9E%E6%99%BA/45/16501_1.png">--><!--<i class="fa fa-play-circle red_light"></i>--><!--<div class="fl">--><!--<p>我叫什么名来着</p>--><!--<p class="red">东方妖妖梦</p>--><!--</div>--><!--<div style="clear: both"></div>--><!--</li>-->
<!--<img class="fl" src="https://ygobbs.com/user_avatar/ygobbs.com/sky%E7%A5%9E%E6%99%BA/45/16501_1.png">-->
<!--<i class="fa fa-play-circle red_light"></i>-->
<!--<div class="fl">-->
<!--<p>我叫什么名来着</p>-->
<!--<p class="red">东方妖妖梦</p>-->
<!--</div>-->
<!--<div style="clear: both"></div>-->
<!--</li>-->
<!--<li>--> <!--<li>--><!--<img class="fl" src="https://ygobbs.com/user_avatar/ygobbs.com/%E6%98%9F%E5%85%89pokeboy/45/10237_1.png">--><!--<i class="fa fa-question-circle blue_light"></i>--><!--<div class="fl">--><!--<p>我叫什么名来着</p>--><!--<p>发呆ing</p>--><!--</div>--><!--<div style="clear: both"></div>--><!--</li>-->
<!--<img class="fl" src="https://ygobbs.com/user_avatar/ygobbs.com/%E6%98%9F%E5%85%89pokeboy/45/10237_1.png">-->
<!--<i class="fa fa-question-circle blue_light"></i>-->
<!--<div class="fl">-->
<!--<p>我叫什么名来着</p>-->
<!--<p>发呆ing</p>-->
<!--</div>-->
<!--<div style="clear: both"></div>-->
<!--</li>-->
<!--<li>--> <!--<li>--><!--<img class="fl" src="https://ygobbs.com//user_avatar/ygobbs.com/%E7%B1%B3%E7%B1%B3%E7%B1%B3%E5%BE%B7%E6%8B%89%E4%BB%80/45/17187_1.png">--><!--<i class="fa fa-clock-o grey"></i>--><!--<div class="fl">--><!--<p>我叫什么名来着</p>--><!--<p>发呆ing</p>--><!--</div>--><!--<div style="clear: both"></div>--><!--</li>--><!--</ul>--><!--</div>--><!--</div>-->
<!--<img class="fl" src="https://ygobbs.com//user_avatar/ygobbs.com/%E7%B1%B3%E7%B1%B3%E7%B1%B3%E5%BE%B7%E6%8B%89%E4%BB%80/45/17187_1.png">-->
<!--<i class="fa fa-clock-o grey"></i>-->
<!--<div class="fl">-->
<!--<p>我叫什么名来着</p>-->
<!--<p>发呆ing</p>-->
<!--</div>-->
<!--<div style="clear: both"></div>-->
<!--</li>-->
<!--</ul>-->
<!--</div>-->
<!--</div>-->
<i *ngIf="update_status === 'error'" (click)="autoUpdater.checkForUpdates()" class="fa fa-exclamation-circle" <i *ngIf="update_status === 'error'" (click)="autoUpdater.checkForUpdates()" class="fa fa-exclamation-circle" i18n-title title="更新出错,点击重试"></i>
i18n-title title="更新出错,点击重试"></i> <i *ngIf="update_status === 'checking-for-update'" class="fa fa-spinner fa-pulse fa-spin" i18n-title title="正在检查更新"></i>
<i *ngIf="update_status === 'checking-for-update'" class="fa fa-spinner fa-pulse fa-spin" <i *ngIf="update_status === 'update-available'" class="fa fa-refresh fa-spin" i18n-title title="正在下载更新"></i>
i18n-title title="正在检查更新"></i> <i *ngIf="update_status === 'update-downloaded'" (click)="autoUpdater.quitAndInstall()" class="fa fa-angle-double-up" i18n-title title="下载更新完成,点击安装"></i>
<i *ngIf="update_status === 'update-available'" class="fa fa-refresh fa-spin"
i18n-title title="正在下载更新"></i>
<i *ngIf="update_status === 'update-downloaded'" (click)="autoUpdater.quitAndInstall()" class="fa fa-angle-double-up"
i18n-title title="下载更新完成,点击安装"></i>
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
* Created by zh99998 on 16/9/2. * Created by zh99998 on 16/9/2.
*/ */
import { ChangeDetectorRef, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ChangeDetectorRef, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
import * as fs from 'fs'; import { Headers, Http, URLSearchParams } from '@angular/http';
import * as path from 'path';
import * as child_process from 'child_process'; import * as child_process from 'child_process';
import { remote, shell } from 'electron'; import { remote, shell } from 'electron';
import * as fs from 'fs';
import * as ini from 'ini'; import * as ini from 'ini';
import { EncodeOptions } from 'ini'; import { EncodeOptions } from 'ini';
import { Headers, Http, URLSearchParams } from '@angular/http'; import * as $ from 'jquery';
import * as path from 'path';
import 'rxjs/Rx'; import 'rxjs/Rx';
import { ISubscription } from 'rxjs/Subscription'; import { ISubscription } from 'rxjs/Subscription';
import * as $ from 'jquery';
import { Cube } from '../cube'; import { Cube } from '../cube';
import { CubesService } from '../cubes.service'; import { CubesService } from '../cubes.service';
import { LoginService } from '../login.service'; import { LoginService } from '../login.service';
......
...@@ -173,7 +173,6 @@ app.on('window-all-closed', function () { ...@@ -173,7 +173,6 @@ app.on('window-all-closed', function () {
}); });
app.on('activate', function (event) { app.on('activate', function (event) {
console.log(event);
// On OS X it's common to re-create a window in the currentCube when the // On OS X it's common to re-create a window in the currentCube when the
// dock icon is clicked and there are no other windows open. // dock icon is clicked and there are no other windows open.
if (mainWindow === null) { if (mainWindow === null) {
......
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