Skip to content

Commit 79febbd

Browse files
wilhelmguoBennieMeng
wilhelmguo
authored and
BennieMeng
committed
Merge pull request Qihoo360#90 from wilhelmguo/feature/format_frontend_code
Feature/format frontend code
2 parents 289919e + 917a63e commit 79febbd

File tree

742 files changed

+11050
-9747
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

742 files changed

+11050
-9747
lines changed

‎src/frontend/src/_requestAnimationFrame.polyfill.ts‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,31 @@
55
* @link http://my.opera.com/emoller/blog/2011/12/20/requestanimationframe-for-smart-er-animating
66
* @license MIT
77
*/
8-
(function() {
9-
var lastTime = 0;
10-
var vendors = ['ms', 'moz', 'o', 'webkit'];
11-
for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
12-
window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame'];
13-
window.cancelAnimationFrame = window[vendors[x]+'CancelAnimationFrame'] ||
14-
window[vendors[x]+'CancelRequestAnimationFrame'];
15-
}
8+
(function () {
9+
var lastTime = 0;
10+
var vendors = ['ms', 'moz', 'o', 'webkit'];
11+
for (var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
12+
window.requestAnimationFrame = window[vendors[x] + 'RequestAnimationFrame'];
13+
window.cancelAnimationFrame = window[vendors[x] + 'CancelAnimationFrame'] ||
14+
window[vendors[x] + 'CancelRequestAnimationFrame'];
15+
}
1616

17-
if (!window.requestAnimationFrame) {
18-
window.requestAnimationFrame = (callback) => {
19-
var currTime = new Date().getTime();
20-
var timeToCall = Math.max(0, 16 - (currTime - lastTime));
21-
var id = window.setTimeout(function() { callback(currTime + timeToCall); },
22-
timeToCall);
23-
lastTime = currTime + timeToCall;
24-
return id;
25-
};
26-
}
17+
if (!window.requestAnimationFrame) {
18+
window.requestAnimationFrame = (callback) => {
19+
var currTime = new Date().getTime();
20+
var timeToCall = Math.max(0, 16 - (currTime - lastTime));
21+
var id = window.setTimeout(function () {
22+
callback(currTime + timeToCall);
23+
},
24+
timeToCall);
25+
lastTime = currTime + timeToCall;
26+
return id;
27+
};
28+
}
2729

28-
if (!window.cancelAnimationFrame) {
29-
window.cancelAnimationFrame = function(id) {
30-
clearTimeout(id);
31-
};
32-
}
30+
if (!window.cancelAnimationFrame) {
31+
window.cancelAnimationFrame = function (id) {
32+
clearTimeout(id);
33+
};
34+
}
3335
}());

‎src/frontend/src/app/admin/admin-routing.module.ts‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
1-
import {NgModule} from '@angular/core';
2-
import {RouterModule, Routes} from '@angular/router';
3-
import {AdminComponent} from './admin.component';
4-
import {DeploymentComponent} from './deployment/deployment.component';
5-
import {AppComponent} from './app/app.component';
6-
import {TrashAppComponent} from './app/trash-app/trash-app.component';
7-
import {TrashDeploymentComponent} from './deployment/trash-deployment/trash-deployment.component';
8-
import {DeploymentTplComponent} from './deploymenttpl/deploymenttpl.component';
9-
import {TrashDeploymentTplComponent} from './deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component';
10-
import {ClusterComponent} from './cluster/cluster.component';
11-
import {TrashClusterComponent} from './cluster/trash-cluster/trash-cluster.component';
12-
import {NamespaceComponent} from './namespace/namespace.component';
13-
import {UserComponent} from './user/user.component';
14-
import {GroupComponent} from './group/group.component';
15-
import {PermissionComponent} from './permission/permission.component';
16-
import {SecretComponent} from './secret/secret.component';
17-
import {TrashSecretComponent} from './secret/trash-secret/trash-secret.component';
18-
import {SecretTplComponent} from './secrettpl/secrettpl.component';
19-
import {TrashSecretTplComponent} from './secrettpl/trash-secrettpl/trash-secrettpl.component';
20-
import {TrashNamespaceComponent} from './namespace/trash-namespace/trash-namespace.component';
21-
import {ConfigMapComponent} from './configmap/configmap.component';
22-
import {TrashConfigMapComponent} from './configmap/trash-configmap/trash-configmap.component';
23-
import {ConfigMapTplComponent} from './configmaptpl/configmaptpl.component';
24-
import {TrashConfigMapTplComponent} from './configmaptpl/trash-configmaptpl/trash-configmaptpl.component';
25-
import {CronjobComponent} from './cronjob/cronjob.component';
26-
import {TrashCronjobComponent} from './cronjob/trash-cronjob/trash-cronjob.component';
27-
import {CronjobTplComponent} from './cronjobtpl/cronjobtpl.component';
28-
import {TrashCronjobTplComponent} from './cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component';
29-
import {AdminAuthCheckGuard} from '../shared/auth/admin-auth-check-guard.service';
30-
import {PersistentVolumeComponent} from './persistentvolume/persistentvolume.component';
31-
import {PersistentVolumeClaimComponent} from './persistentvolumeclaim/persistentvolumeclaim.component';
32-
import {TrashPersistentVolumeClaimComponent} from './persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component';
33-
import {PersistentVolumeClaimTplComponent} from './persistentvolumeclaimtpl/persistentvolumeclaimtpl.component';
34-
import {TrashPersistentVolumeClaimTplComponent} from './persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component';
35-
import {AuditLogComponent} from './auditlog/auditlog.component';
36-
import {CreateEditPersistentVolumeComponent} from './persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component';
37-
import {ApiKeyComponent} from './apikey/apikey.component';
38-
import {AppReportFormComponent} from './reportform/app/app-reportform.component';
39-
import {OverviewComponent} from './reportform/overview/overview.component';
40-
import {DeployComponent} from './reportform/deploy/deploy.component';
41-
import {StatefulsetComponent} from './statefulset/statefulset.component';
42-
import {TrashStatefulsetComponent} from './statefulset/trash-statefulset/trash-statefulset.component';
43-
import {StatefulsettplComponent} from './statefulsettpl/statefulsettpl.component';
44-
import {TrashStatefulsettplComponent} from './statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component';
45-
import {DaemonsetComponent} from './daemonset/daemonset.component';
46-
import {TrashDaemonsetComponent} from './daemonset/trash-daemonset/trash-daemonset.component';
47-
import {DaemonsettplComponent} from './daemonsettpl/daemonsettpl.component';
48-
import {TrashDaemonsettplComponent} from './daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component';
49-
import {ConfigComponent} from './config/config.component';
50-
import {ConfigSystemComponent} from './config/list-config-system/config-system.component';
51-
import {KubernetesDashboardComponent} from './kubernetes-dashboard/kubernetes-dashboard.component';
52-
import {NotificationComponent} from './notification/notification.component';
53-
import {NodesComponent} from './node/nodes.component';
54-
import {ADMINROUTES} from "../../../lib/admin/library-routing-admin";
1+
import { NgModule } from '@angular/core';
2+
import { RouterModule, Routes } from '@angular/router';
3+
import { AdminComponent } from './admin.component';
4+
import { DeploymentComponent } from './deployment/deployment.component';
5+
import { AppComponent } from './app/app.component';
6+
import { TrashAppComponent } from './app/trash-app/trash-app.component';
7+
import { TrashDeploymentComponent } from './deployment/trash-deployment/trash-deployment.component';
8+
import { DeploymentTplComponent } from './deploymenttpl/deploymenttpl.component';
9+
import { TrashDeploymentTplComponent } from './deploymenttpl/trash-deploymenttpl/trash-deploymenttpl.component';
10+
import { ClusterComponent } from './cluster/cluster.component';
11+
import { TrashClusterComponent } from './cluster/trash-cluster/trash-cluster.component';
12+
import { NamespaceComponent } from './namespace/namespace.component';
13+
import { UserComponent } from './user/user.component';
14+
import { GroupComponent } from './group/group.component';
15+
import { PermissionComponent } from './permission/permission.component';
16+
import { SecretComponent } from './secret/secret.component';
17+
import { TrashSecretComponent } from './secret/trash-secret/trash-secret.component';
18+
import { SecretTplComponent } from './secrettpl/secrettpl.component';
19+
import { TrashSecretTplComponent } from './secrettpl/trash-secrettpl/trash-secrettpl.component';
20+
import { TrashNamespaceComponent } from './namespace/trash-namespace/trash-namespace.component';
21+
import { ConfigMapComponent } from './configmap/configmap.component';
22+
import { TrashConfigMapComponent } from './configmap/trash-configmap/trash-configmap.component';
23+
import { ConfigMapTplComponent } from './configmaptpl/configmaptpl.component';
24+
import { TrashConfigMapTplComponent } from './configmaptpl/trash-configmaptpl/trash-configmaptpl.component';
25+
import { CronjobComponent } from './cronjob/cronjob.component';
26+
import { TrashCronjobComponent } from './cronjob/trash-cronjob/trash-cronjob.component';
27+
import { CronjobTplComponent } from './cronjobtpl/cronjobtpl.component';
28+
import { TrashCronjobTplComponent } from './cronjobtpl/trash-cronjobtpl/trash-cronjobtpl.component';
29+
import { AdminAuthCheckGuard } from '../shared/auth/admin-auth-check-guard.service';
30+
import { PersistentVolumeComponent } from './persistentvolume/persistentvolume.component';
31+
import { PersistentVolumeClaimComponent } from './persistentvolumeclaim/persistentvolumeclaim.component';
32+
import { TrashPersistentVolumeClaimComponent } from './persistentvolumeclaim/trash-persistentvolumeclaim/trash-persistentvolumeclaim.component';
33+
import { PersistentVolumeClaimTplComponent } from './persistentvolumeclaimtpl/persistentvolumeclaimtpl.component';
34+
import { TrashPersistentVolumeClaimTplComponent } from './persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl/trash-persistentvolumeclaimtpl.component';
35+
import { AuditLogComponent } from './auditlog/auditlog.component';
36+
import { CreateEditPersistentVolumeComponent } from './persistentvolume/create-edit-persistentvolume/create-edit-persistentvolume.component';
37+
import { ApiKeyComponent } from './apikey/apikey.component';
38+
import { AppReportFormComponent } from './reportform/app/app-reportform.component';
39+
import { OverviewComponent } from './reportform/overview/overview.component';
40+
import { DeployComponent } from './reportform/deploy/deploy.component';
41+
import { StatefulsetComponent } from './statefulset/statefulset.component';
42+
import { TrashStatefulsetComponent } from './statefulset/trash-statefulset/trash-statefulset.component';
43+
import { StatefulsettplComponent } from './statefulsettpl/statefulsettpl.component';
44+
import { TrashStatefulsettplComponent } from './statefulsettpl/trash-statefulsettpl/trash-statefulsettpl.component';
45+
import { DaemonsetComponent } from './daemonset/daemonset.component';
46+
import { TrashDaemonsetComponent } from './daemonset/trash-daemonset/trash-daemonset.component';
47+
import { DaemonsettplComponent } from './daemonsettpl/daemonsettpl.component';
48+
import { TrashDaemonsettplComponent } from './daemonsettpl/trash-daemonsettpl/trash-daemonsettpl.component';
49+
import { ConfigComponent } from './config/config.component';
50+
import { ConfigSystemComponent } from './config/list-config-system/config-system.component';
51+
import { KubernetesDashboardComponent } from './kubernetes-dashboard/kubernetes-dashboard.component';
52+
import { NotificationComponent } from './notification/notification.component';
53+
import { NodesComponent } from './node/nodes.component';
54+
import { ADMINROUTES } from '../../../lib/admin/library-routing-admin';
5555

5656

5757
const routes: Routes = [

‎src/frontend/src/app/admin/admin.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<clr-main-container class="main-container">
22
<global-message></global-message>
33

4-
<wayne-nav ></wayne-nav>
4+
<wayne-nav></wayne-nav>
55
<div class="content-container">
66
<div class="content-area">
77
<wayne-breadcrumb></wayne-breadcrumb>
@@ -11,4 +11,4 @@
1111
</div>
1212
</clr-main-container>
1313
<confiramtion-dialog style="display: flex"></confiramtion-dialog>
14-
<wayne-ace-editor></wayne-ace-editor>
14+
<wayne-ace-editor></wayne-ace-editor>

‎src/frontend/src/app/admin/admin.component.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ describe('AdminComponent', () => {
88

99
beforeEach(async(() => {
1010
TestBed.configureTestingModule({
11-
declarations: [ AdminComponent ]
11+
declarations: [AdminComponent]
1212
})
13-
.compileComponents();
13+
.compileComponents();
1414
}));
1515

1616
beforeEach(() => {

‎src/frontend/src/app/admin/admin.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {Component, OnInit} from '@angular/core';
2-
import {BreadcrumbService} from '../shared/client/v1/breadcrumb.service';
1+
import { Component, OnInit } from '@angular/core';
2+
import { BreadcrumbService } from '../shared/client/v1/breadcrumb.service';
33

44
@Component({
55
selector: 'wayne-admin',

‎src/frontend/src/app/admin/admin.module.ts‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
import {NgModule} from '@angular/core';
2-
import {AdminRoutingModule} from './admin-routing.module';
3-
import {AdminComponent} from './admin.component';
4-
import {AppModule} from './app/app.module';
5-
import {SharedModule} from '../shared/shared.module';
6-
import {DeploymentModule} from './deployment/deployment.module';
7-
import {DeploymentTplModule} from './deploymenttpl/deploymenttpl.module';
8-
import {ClusterModule} from './cluster/cluster.module';
9-
import {NamespaceModule} from './namespace/namespace.module';
10-
import {UserModule} from './user/user.module';
11-
import {GroupModule} from './group/group.module';
12-
import {PermissionModule} from './permission/permission.module';
13-
import {SecretModule} from './secret/secret.module';
14-
import {SecrettplModule} from './secrettpl/secrettpl.module';
15-
import {ConfigMapModule} from './configmap/configmap.module';
16-
import {ConfigMapTplModule} from './configmaptpl/configmaptpl.module';
17-
import {CronjobModule} from './cronjob/cronjob.module';
18-
import {CronjobTplModule} from './cronjobtpl/cronjobtpl.module';
19-
import {AuthService} from '../shared/auth/auth.service';
20-
import {AdminAuthCheckGuard} from '../shared/auth/admin-auth-check-guard.service';
21-
import {PersistentVolumeModule} from './persistentvolume/persistentvolume.module';
22-
import {PersistentVolumeClaimModule} from './persistentvolumeclaim/persistentvolumeclaim.module';
23-
import {PersistentVolumeClaimTplModule} from './persistentvolumeclaimtpl/persistentvolumeclaimtpl.module';
24-
import {AuditLogModule} from './auditlog/auditlog.module';
25-
import {ApiKeyModule} from './apikey/apikey.module';
26-
import {ReportFormModule} from './reportform/reportform.module';
27-
import {DaemonsetModule} from './daemonset/daemonset.module';
28-
import {DaemonsettplModule} from './daemonsettpl/daemonsettpl.module';
29-
import {StatefulsetModule} from './statefulset/statefulset.module';
30-
import {StatefulsettplModule} from './statefulsettpl/statefulsettpl.module';
31-
import {ConfigModule} from './config/config.module';
32-
import {KubernetesDashboardModule} from './kubernetes-dashboard/kubernetes-dashboard.module';
33-
import {NavModule} from './nav/nav.module';
34-
import {NotificationModule} from './notification/notification.module';
35-
import {NodesModule} from './node/nodes.module';
36-
import {LibraryAdminModule} from "../../../lib/admin/library-admin.module";
1+
import { NgModule } from '@angular/core';
2+
import { AdminRoutingModule } from './admin-routing.module';
3+
import { AdminComponent } from './admin.component';
4+
import { AppModule } from './app/app.module';
5+
import { SharedModule } from '../shared/shared.module';
6+
import { DeploymentModule } from './deployment/deployment.module';
7+
import { DeploymentTplModule } from './deploymenttpl/deploymenttpl.module';
8+
import { ClusterModule } from './cluster/cluster.module';
9+
import { NamespaceModule } from './namespace/namespace.module';
10+
import { UserModule } from './user/user.module';
11+
import { GroupModule } from './group/group.module';
12+
import { PermissionModule } from './permission/permission.module';
13+
import { SecretModule } from './secret/secret.module';
14+
import { SecrettplModule } from './secrettpl/secrettpl.module';
15+
import { ConfigMapModule } from './configmap/configmap.module';
16+
import { ConfigMapTplModule } from './configmaptpl/configmaptpl.module';
17+
import { CronjobModule } from './cronjob/cronjob.module';
18+
import { CronjobTplModule } from './cronjobtpl/cronjobtpl.module';
19+
import { AuthService } from '../shared/auth/auth.service';
20+
import { AdminAuthCheckGuard } from '../shared/auth/admin-auth-check-guard.service';
21+
import { PersistentVolumeModule } from './persistentvolume/persistentvolume.module';
22+
import { PersistentVolumeClaimModule } from './persistentvolumeclaim/persistentvolumeclaim.module';
23+
import { PersistentVolumeClaimTplModule } from './persistentvolumeclaimtpl/persistentvolumeclaimtpl.module';
24+
import { AuditLogModule } from './auditlog/auditlog.module';
25+
import { ApiKeyModule } from './apikey/apikey.module';
26+
import { ReportFormModule } from './reportform/reportform.module';
27+
import { DaemonsetModule } from './daemonset/daemonset.module';
28+
import { DaemonsettplModule } from './daemonsettpl/daemonsettpl.module';
29+
import { StatefulsetModule } from './statefulset/statefulset.module';
30+
import { StatefulsettplModule } from './statefulsettpl/statefulsettpl.module';
31+
import { ConfigModule } from './config/config.module';
32+
import { KubernetesDashboardModule } from './kubernetes-dashboard/kubernetes-dashboard.module';
33+
import { NavModule } from './nav/nav.module';
34+
import { NotificationModule } from './notification/notification.module';
35+
import { NodesModule } from './node/nodes.module';
36+
import { LibraryAdminModule } from '../../../lib/admin/library-admin.module';
3737

3838
@NgModule({
3939
imports: [

‎src/frontend/src/app/admin/apikey/apikey.component.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
import {Component, OnInit, ViewChild} from '@angular/core';
2-
import {State} from '@clr/angular';
3-
import {ConfirmationDialogService} from '../../shared/confirmation-dialog/confirmation-dialog.service';
4-
import {ConfirmationMessage} from '../../shared/confirmation-dialog/confirmation-message';
5-
import {ConfirmationButtons, ConfirmationState, ConfirmationTargets} from '../../shared/shared.const';
6-
import {Subscription} from 'rxjs/Subscription';
7-
import {MessageHandlerService} from '../../shared/message-handler/message-handler.service';
8-
import {CacheService} from '../../shared/auth/cache.service';
9-
import {AuthService} from '../../shared/auth/auth.service';
10-
import {PageState} from '../../shared/page/page-state';
11-
import {ListApiKeyComponent} from './list-apikey/list-apikey.component';
12-
import {CreateEditApiKeyComponent} from './create-edit-apikey/create-edit-apikey.component';
13-
import {ApiKey} from '../../shared/model/v1/apikey';
14-
import {ApiKeyService} from '../../shared/client/v1/apikey.service';
1+
import { Component, OnInit, ViewChild } from '@angular/core';
2+
import { State } from '@clr/angular';
3+
import { ConfirmationDialogService } from '../../shared/confirmation-dialog/confirmation-dialog.service';
4+
import { ConfirmationMessage } from '../../shared/confirmation-dialog/confirmation-message';
5+
import { ConfirmationButtons, ConfirmationState, ConfirmationTargets } from '../../shared/shared.const';
6+
import { Subscription } from 'rxjs/Subscription';
7+
import { MessageHandlerService } from '../../shared/message-handler/message-handler.service';
8+
import { CacheService } from '../../shared/auth/cache.service';
9+
import { AuthService } from '../../shared/auth/auth.service';
10+
import { PageState } from '../../shared/page/page-state';
11+
import { ListApiKeyComponent } from './list-apikey/list-apikey.component';
12+
import { CreateEditApiKeyComponent } from './create-edit-apikey/create-edit-apikey.component';
13+
import { ApiKey } from '../../shared/model/v1/apikey';
14+
import { ApiKeyService } from '../../shared/client/v1/apikey.service';
1515

1616
@Component({
1717
selector: 'wayne-apikey',
@@ -83,7 +83,7 @@ export class ApiKeyComponent implements OnInit {
8383

8484
createApiKey(created: boolean) {
8585
if (created) {
86-
this.retrieve()
86+
this.retrieve();
8787
}
8888
}
8989

‎src/frontend/src/app/admin/apikey/apikey.module.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import {NgModule} from '@angular/core';
2-
import {SharedModule} from '../../shared/shared.module';
3-
import {ApiKeyService} from '../../shared/client/v1/apikey.service';
4-
import {CreateEditApiKeyComponent} from './create-edit-apikey/create-edit-apikey.component';
5-
import {ListApiKeyComponent} from './list-apikey/list-apikey.component';
6-
import {ApiKeyComponent} from './apikey.component';
7-
import {TokenDetailComponent} from './token-detail/token-detail';
1+
import { NgModule } from '@angular/core';
2+
import { SharedModule } from '../../shared/shared.module';
3+
import { ApiKeyService } from '../../shared/client/v1/apikey.service';
4+
import { CreateEditApiKeyComponent } from './create-edit-apikey/create-edit-apikey.component';
5+
import { ListApiKeyComponent } from './list-apikey/list-apikey.component';
6+
import { ApiKeyComponent } from './apikey.component';
7+
import { TokenDetailComponent } from './token-detail/token-detail';
88

99
@NgModule({
1010
imports: [

0 commit comments

Comments
 (0)
⚡