Skip to content

Commit 1554f4d

Browse files
coolsamson7coolsamson7
committed
pretty printing...
1 parent d3aeac1 commit 1554f4d

Some content is hidden

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

54 files changed

+845
-778
lines changed

Diff for: ‎src/app/app.component.spec.ts

+25-26
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
11
/* tslint:disable:no-unused-variable */
2-
3-
import { TestBed, async } from '@angular/core/testing';
4-
import { AppComponent } from './app.component';
2+
import {TestBed, async} from "@angular/core/testing";
3+
import {AppComponent} from "./app.component";
54

65
describe('AppComponent', () => {
7-
beforeEach(() => {
8-
TestBed.configureTestingModule({
9-
declarations: [
10-
AppComponent
11-
],
6+
beforeEach(() => {
7+
TestBed.configureTestingModule({
8+
declarations: [
9+
AppComponent
10+
],
11+
});
12+
TestBed.compileComponents();
1213
});
13-
TestBed.compileComponents();
14-
});
1514

16-
it('should create the app', async(() => {
17-
const fixture = TestBed.createComponent(AppComponent);
18-
const app = fixture.debugElement.componentInstance;
19-
expect(app).toBeTruthy();
20-
}));
15+
it('should create the app', async(() => {
16+
const fixture = TestBed.createComponent(AppComponent);
17+
const app = fixture.debugElement.componentInstance;
18+
expect(app).toBeTruthy();
19+
}));
2120

22-
it(`should have as title 'app works!'`, async(() => {
23-
const fixture = TestBed.createComponent(AppComponent);
24-
const app = fixture.debugElement.componentInstance;
25-
expect(app.title).toEqual('app works!');
26-
}));
21+
it(`should have as title 'app works!'`, async(() => {
22+
const fixture = TestBed.createComponent(AppComponent);
23+
const app = fixture.debugElement.componentInstance;
24+
expect(app.title).toEqual('app works!');
25+
}));
2726

28-
it('should render title in a h1 tag', async(() => {
29-
const fixture = TestBed.createComponent(AppComponent);
30-
fixture.detectChanges();
31-
const compiled = fixture.debugElement.nativeElement;
32-
expect(compiled.querySelector('h1').textContent).toContain('app works!');
33-
}));
27+
it('should render title in a h1 tag', async(() => {
28+
const fixture = TestBed.createComponent(AppComponent);
29+
fixture.detectChanges();
30+
const compiled = fixture.debugElement.nativeElement;
31+
expect(compiled.querySelector('h1').textContent).toContain('app works!');
32+
}));
3433
});

Diff for: ‎src/app/app.component.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { Component } from '@angular/core';
1+
import {Component} from "@angular/core";
22

33
@Component({
4-
selector: 'app-root',
5-
templateUrl: './app.component.html',
6-
styleUrls: ['./app.component.less']
4+
selector: 'app-root',
5+
templateUrl: './app.component.html',
6+
styleUrls: ['./app.component.less']
77
})
88
export class AppComponent {
9-
title = 'app works!';
9+
title = 'app works!';
1010
}

Diff for: ‎src/app/app.module.ts

+97-81
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
1-
import { BrowserModule } from '@angular/platform-browser';
2-
import { NgModule } from '@angular/core';
3-
import { FormsModule } from '@angular/forms';
4-
import { HttpModule } from '@angular/http';
5-
1+
import {BrowserModule} from "@angular/platform-browser";
2+
import {NgModule} from "@angular/core";
3+
import {FormsModule} from "@angular/forms";
4+
import {HttpModule} from "@angular/http";
65
//import { Ng2BootstrapModule } from 'ng2-bootstrap/ng2-bootstrap';
7-
8-
import { AppComponent } from './app.component';
6+
import {AppComponent} from "./app.component";
97
import {
10-
RenderFactory, ComparatorFactory, NgTableComponent,
11-
NgTableSortingDirective
8+
RenderFactory,
9+
ComparatorFactory,
10+
NgTableComponent,
11+
NgTableSortingDirective
1212
} from "./widgets/widgets-table.component";
1313
import {ComponentRegistry, ComponentFactoryBuilder} from "./editor/editor-component.class";
1414
import {Tracer} from "./util/util-trace";
1515
import {
16-
PropertyEditorBuilder, PropertyLabelComponent, EditorGroupComponent,
17-
ComponentEditorComponent, ValueOrBindingEditor, PropertyEditorComponent, AttributeEditorComponent,
18-
BooleanPropertyComponent, EnumPropertyComponent
16+
PropertyEditorBuilder,
17+
PropertyLabelComponent,
18+
EditorGroupComponent,
19+
ComponentEditorComponent,
20+
ValueOrBindingEditor,
21+
PropertyEditorComponent,
22+
AttributeEditorComponent,
23+
BooleanPropertyComponent,
24+
EnumPropertyComponent
1925
} from "./editor/editor-property-editor";
2026
import {TreeComponentBuilder, TreeComponent, TreeNode, NodeContent} from "./widgets/widgets-tree";
2127
import {EditorObjects} from "./editor/editor-core-objects";
@@ -33,13 +39,22 @@ import {RenderComponent} from "./editor/editor-render-component.component";
3339
import {UIEditorComponent, OpenFileDialog} from "./editor/editor-ui-editor.component";
3440
import {SplitPane, SplitPanel, Splitter} from "./widgets/widgets-splitter";
3541
import {
36-
FontEditor, PropertyChoiceButtons, PropertyButton,
37-
PropertyChoiceCombo, BoxComponent
42+
FontEditor,
43+
PropertyChoiceButtons,
44+
PropertyButton,
45+
PropertyChoiceCombo,
46+
BoxComponent
3847
} from "./editor/editor-property-editor-components";
3948
import {Tabs, Tab, TabHeader} from "./widgets/widgets-tabs";
4049
import {
41-
EditableLabel, ElasticInputDirective, EditableH1, EditableH2, EditableH3,
42-
EditableH4, EditableH5, EditableButton
50+
EditableLabel,
51+
ElasticInputDirective,
52+
EditableH1,
53+
EditableH2,
54+
EditableH3,
55+
EditableH4,
56+
EditableH5,
57+
EditableButton
4358
} from "./widgets/ui-inplace-edit";
4459
import {TriangleComponent, Confirm, ConfirmWindow, MenuContent, ContextMenu} from "./widgets/widgets-context-menu";
4560
import {Tooltip, TooltipComponent} from "./widgets/widgets-tooltip";
@@ -51,97 +66,98 @@ import {CommonModule} from "@angular/common";
5166

5267

5368
const services = [
54-
RenderFactory, ComparatorFactory,
55-
ComponentRegistry, ComponentFactoryBuilder,
69+
RenderFactory, ComparatorFactory,
70+
ComponentRegistry, ComponentFactoryBuilder,
5671

57-
Tracer,
72+
Tracer,
5873

59-
PropertyEditorBuilder,
74+
PropertyEditorBuilder,
6075

61-
TreeComponentBuilder,
62-
EditorObjects, EditorService,
76+
TreeComponentBuilder,
77+
EditorObjects, EditorService,
6378

64-
Shortcut,
79+
Shortcut,
6580

66-
ToastService,
67-
Overlays,
81+
ToastService,
82+
Overlays,
6883

69-
DownloadService
84+
DownloadService
7085
];
7186

7287
const components = [
73-
OverlayContainer,
88+
OverlayContainer,
7489

75-
NgTableComponent, NgTableSortingDirective,
90+
NgTableComponent, NgTableSortingDirective,
7691

77-
UIEditorComponent, EditComponent, RenderComponent, ComponentDirective, PropertyEditorComponent, EditorComponent, ValueOrBindingEditor,ComponentTreeComponent,
78-
PaletteComponent, ComponentEditorComponent, EditorGroupComponent, PropertyLabelComponent, ComponentGroupComponent,
92+
UIEditorComponent, EditComponent, RenderComponent, ComponentDirective, PropertyEditorComponent, EditorComponent, ValueOrBindingEditor, ComponentTreeComponent,
93+
PaletteComponent, ComponentEditorComponent, EditorGroupComponent, PropertyLabelComponent, ComponentGroupComponent,
7994

8095

81-
DragSourceComponent, DropTargetComponent,
96+
DragSourceComponent, DropTargetComponent,
8297

83-
TreeComponent, TreeNode, NodeContent,
98+
TreeComponent, TreeNode, NodeContent,
8499

85-
SplitPane, SplitPanel, Splitter,
100+
SplitPane, SplitPanel, Splitter,
86101

87-
FontEditor, PropertyChoiceButtons, PropertyButton, PropertyChoiceCombo, BoxComponent, AttributeEditorComponent, BooleanPropertyComponent, EnumPropertyComponent, // editors
102+
FontEditor, PropertyChoiceButtons, PropertyButton, PropertyChoiceCombo, BoxComponent, AttributeEditorComponent, BooleanPropertyComponent, EnumPropertyComponent, // editors
88103

89-
Tabs, Tab,TabHeader,
104+
Tabs, Tab, TabHeader,
90105

91-
EditableLabel, ElasticInputDirective, EditableH1, EditableH2, EditableH3, EditableH4, EditableH5, EditableButton,
106+
EditableLabel, ElasticInputDirective, EditableH1, EditableH2, EditableH3, EditableH4, EditableH5, EditableButton,
92107

93-
TriangleComponent,
108+
TriangleComponent,
94109

95-
Confirm, ConfirmWindow,
110+
Confirm, ConfirmWindow,
96111

97-
ToastContainer, SetToastContainer, Toast,
112+
ToastContainer, SetToastContainer, Toast,
98113

99-
Tooltip, TooltipComponent,
114+
Tooltip, TooltipComponent,
100115

101-
OpenFileDialog,
116+
OpenFileDialog,
102117

103-
FocusDirective,
118+
FocusDirective,
104119

105-
Breadcrumb
120+
Breadcrumb
106121
];
107122

108123
@NgModule({
109-
declarations: [ EditComponent,
110-
...components,
111-
112-
ContextMenu, MenuContent,
113-
Floating, Floater,
114-
AppComponent
115-
],
116-
imports: [
117-
CommonModule,
118-
BrowserModule,
119-
FormsModule,
120-
HttpModule,
121-
122-
//Ng2BootstrapModule.forRoot(),
123-
NgbModule.forRoot(),
124-
],
125-
providers: [
126-
...services
127-
],
128-
entryComponents: [
129-
MenuContent,
130-
ConfirmWindow,
131-
Floater,
132-
ToastContainer,
133-
TooltipComponent,
134-
135-
// dialogs
136-
137-
OpenFileDialog
138-
],
139-
exports: [
140-
...components,
141-
142-
CommonModule,
143-
FormsModule,
144-
],
145-
bootstrap: [AppComponent]
124+
declarations: [EditComponent,
125+
...components,
126+
127+
ContextMenu, MenuContent,
128+
Floating, Floater,
129+
AppComponent
130+
],
131+
imports: [
132+
CommonModule,
133+
BrowserModule,
134+
FormsModule,
135+
HttpModule,
136+
137+
//Ng2BootstrapModule.forRoot(),
138+
NgbModule.forRoot(),
139+
],
140+
providers: [
141+
...services
142+
],
143+
entryComponents: [
144+
MenuContent,
145+
ConfirmWindow,
146+
Floater,
147+
ToastContainer,
148+
TooltipComponent,
149+
150+
// dialogs
151+
152+
OpenFileDialog
153+
],
154+
exports: [
155+
...components,
156+
157+
CommonModule,
158+
FormsModule,
159+
],
160+
bootstrap: [AppComponent]
146161
})
147-
export class AppModule { }
162+
export class AppModule {
163+
}

Diff for: ‎src/app/editor/editor-change-detector.ts

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
21
class Check {
32
// instance data
43

5-
property: string;
4+
property : string;
65
protected snapshot : any;
76

87
// constructor
98

10-
constructor(property: string) {
11-
this.property = property;
9+
constructor(property : string) {
10+
this.property = property;
1211
}
1312

1413
// protected
1514

16-
protected compare(oldValue: any, newValue: any) : boolean {
15+
protected compare(oldValue : any, newValue : any) : boolean {
1716
// remember new value
1817

1918
this.snapshot = newValue;
@@ -24,7 +23,7 @@ class Check {
2423
//if (changed)
2524
// console.log(this.property + ": '" + JSON.stringify(oldValue) + "' -> '" + JSON.stringify(newValue) + "'");
2625

27-
return changed
26+
return changed;
2827
}
2928

3029
// public
@@ -46,7 +45,7 @@ class CompositeCheck extends Check {
4645

4746
// constructor
4847

49-
constructor(prop: string, properties : string[]) {
48+
constructor(prop : string, properties : string[]) {
5049
super(prop);
5150

5251
this.properties = properties;
@@ -66,7 +65,7 @@ class CompositeCheck extends Check {
6665

6766
// override
6867

69-
public compare(snapshot: any, newValue: any) : boolean {
68+
public compare(snapshot : any, newValue : any) : boolean {
7069
let diff = false;
7170

7271
if (newValue) {
@@ -100,7 +99,7 @@ class CompositeCheck extends Check {
10099
class ArrayCheck extends Check {
101100
// constructor
102101

103-
constructor(property: string) {
102+
constructor(property : string) {
104103
super(property);
105104
}
106105

@@ -118,7 +117,7 @@ class ArrayCheck extends Check {
118117

119118
// override
120119

121-
public compare(oldValue: any, newValue: any) : boolean {
120+
public compare(oldValue : any, newValue : any) : boolean {
122121
let diff = false;
123122

124123
if (newValue) {
@@ -200,4 +199,4 @@ export class ChangeDetector {
200199

201200
return this;
202201
}
203-
}
202+
}

0 commit comments

Comments
 (0)