op

CN-Tower · Sep 17, 2018 · d5b5a9d · d5b5a9d
1 parent 2ab4a6f
commit d5b5a9d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 26 deletions.
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
@@ -151,18 +151,18 @@ <h3 class="panel-title z-ptt-short hide">{{'fmted' | translate}}</h3>
               <a class="links" target="_blank" href="http://github.com/CN-Tower/funclib.js">
                 http://github.com/CN-Tower/funclib.js
               </a><br>
-              <!--electron ignore sta_--><!--
+              <!--electron ignore sta-->
               <i class="fa fa-star"></i>&nbsp;<strong>{{'download_' | translate}}:</strong>&nbsp;&nbsp;
               <a class="links" target="_blank" href="{{updateUrl}}">
                 zjson-win32-x64.exe (v{{remoteVersion}})
               </a><br>
-              --><!--electron ignore end_-->
-              <!--electron enable sta-->
+              <!--electron ignore end-->
+              <!--electron enable sta_--><!--
               <i class="fa fa-star"></i>&nbsp;<strong>{{'website' | translate}}:</strong>&nbsp;&nbsp;
               <a class="links" target="_blank" href="http://www.zjson.net">
                 http://www.zjson.net
               </a><br>
-              <!--electron enable end-->
+              --><!--electron enable end_-->
             </div>
             <div [class.hide]="!isShowFmtToTop" id="fmt-to-top" class="zjs-to-Top">
               <i class="fa fa-arrow-circle-o-up shadow-ico" title="{{'backToTop' | translate}}"></i>

diff --git 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
@@ -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() {