From d5b5a9d10396fdd8302359e0b484952811bdeb48 Mon Sep 17 00:00:00 2001 From: CN-Tower <247114045@qq.com> Date: Mon, 17 Sep 2018 23:17:58 +0800 Subject: [PATCH] op --- client/src/app/app.component.html | 8 ++--- client/src/app/app.component.ts | 36 +++++++++---------- .../app/monaco-editor/monaco-editor.base.ts | 8 ++--- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html index b90b9dc..472a0d0 100644 --- a/client/src/app/app.component.html +++ b/client/src/app/app.component.html @@ -151,18 +151,18 @@

{{'fmted' | translate}}

http://github.com/CN-Tower/funclib.js
-  {{'download_' | translate}}:   zjson-win32-x64.exe (v{{remoteVersion}})
- --> - + + + -->
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index 28cb730..21b2fe0 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts @@ -354,9 +354,9 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit { this.formated = ''; this.fmtSourcest = ''; if (!this.isOriginEmpty) this.animateGreeting(); - /**electron enable sta*/ + /**electron enable sta_*//* fn.defer(() => win.onLinksLoad()); - /**electron enable end*/ + *//**electron enable end_*/ } /** @@ -737,7 +737,7 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit { * 检测、轮询、刷新APP * =================================*/ checkAndUpdateApp() { - /**electron ignore sta_*//* + /**electron ignore sta*/ this.checkAppVersion(false); this.refreshVisitCount(); this.getSharedJson(false); @@ -746,8 +746,8 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit { this.updateUrl = res.updateUrl; }); fn.interval('refresh-visit-count', 300000, () => this.refreshVisitCount()); - *//**electron ignore end_*/ - /**electron enable sta*/ + /**electron ignore end*/ + /**electron enable sta_*//* fn.defer(() => win.checkAppVersion(res => { if (res.version !== res.localVersion) { let ignoreInfo: IgnoreInfo = this.appService.getIgnoreVersion(); @@ -762,7 +762,7 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit { } } })); - /**electron enable end*/ + *//**electron enable end_*/ this.pollingVisitCount(); fn.interval('polling-visit-count', 15000, () => this.pollingVisitCount()); } @@ -803,14 +803,14 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit { * =================================*/ pollingVisitCount() { const userId = this.appService.getUserId(); - /**electron ignore sta_*//* + /**electron ignore sta*/ this.appService.pollingVisitCount(userId, this.isOnInit).subscribe((res: any) => { if (res['vc']) win['vc'] = res.vc; }); - *//**electron ignore end_*/ - /**electron enable sta*/ + /**electron ignore end*/ + /**electron enable sta_*//* fn.defer(() => win.pollingVisitCount(userId, this.isOnInit)); - /**electron enable end*/ + *//**electron enable end_*/ this.isOnInit = false; } @@ -835,12 +835,12 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit { this.broadcast.hideLoading(); this.alertNotice(this.translate.instant('_shareJsonError'), 'danger'); }; - /**electron ignore sta_*//* + /**electron ignore sta*/ this.appService.shareFormated(this.formated).subscribe(success, error); - *//**electron ignore end_*/ - /**electron enable sta*/ + /**electron ignore end*/ + /**electron enable sta_*//* win.shareFormated(this.formated, this.appService.getUserId(), success, error); - /**electron enable end*/ + *//**electron enable end_*/ } /** @@ -856,19 +856,19 @@ export class AppComponent extends ZjsApp implements OnInit, AfterViewInit { this.broadcast.hideLoading(); this.alertNotice(this.translate.instant('_getJsonError'), 'danger'); }; - /**electron ignore sta_*//* + /**electron ignore sta*/ this.appService.getSharedJson(sharedId).subscribe(res => { this.broadcast.hideLoading(); this.sourcest = res.sharedJson; }, error); - *//**electron ignore end_*/ - /**electron enable sta*/ + /**electron ignore end*/ + /**electron enable sta_*//* win.getSharedJson(sharedId, res => { this.broadcast.hideLoading(); this.sourcest = res.sharedJson; $('#format-btn').click(); }, error); - /**electron enable end*/ + *//**electron enable end_*/ } if (!sharedId && isFromIpt) { this.alertNotice(this.translate.instant('_bdSharedLink'), 'danger'); diff --git a/client/src/app/monaco-editor/monaco-editor.base.ts b/client/src/app/monaco-editor/monaco-editor.base.ts index 889d493..2864ca6 100644 --- a/client/src/app/monaco-editor/monaco-editor.base.ts +++ b/client/src/app/monaco-editor/monaco-editor.base.ts @@ -19,7 +19,7 @@ export class MonacoEditorBase implements AfterViewInit { } addLoaderScript() { - /**electron ignore sta_*//* + /**electron ignore sta*/ const loaderScript: HTMLScriptElement = document.createElement('script'); loaderScript.type = 'text/javascript'; loaderScript.src = 'assets/lib/monaco-editor/vs/loader.js'; @@ -31,13 +31,13 @@ export class MonacoEditorBase implements AfterViewInit { }); }); document.body.appendChild(loaderScript); - *//**electron ignore end_*/ - /**electron enable sta*/ + /**electron ignore end*/ + /**electron enable sta_*//* fn.defer(() => win.loadMonacoEditor(() => { this.defineEditorThemes(); this.broadcast.editorReadyUp(); })); - /**electron enable end*/ + *//**electron enable end_*/ } defineEditorThemes() {