Skip to content

Commit 3aed1ef

Browse files
authored
Merge pull request #96 from PioneerCode/bug-fixes
Fix table bugs & add documentation configs.
2 parents 3507914 + 3ae64ae commit 3aed1ef

28 files changed

+158
-43
lines changed

CHANGELOG.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
<a name="0.8.0"></a>
2-
# [v0.8](https://github.com/PioneerCode/pioneer-charts/releases/tag/0.8.0) (2018-05-27)
1+
<a name="0.8.2"></a>
2+
# [v0.8.1](https://github.com/PioneerCode/pioneer-charts/releases/tag/0.8.1) (2018-05-29)
33

4-
### Features
4+
### Fixes
55

6-
- Add option to enable sticky footer/header on table.
7-
- Add ability to sortable by column.
6+
- Table
7+
- Clear header cache on re-int of UI.
8+
- Scoped margin style.
9+
- Check for UI build when no data is present.
10+
- Width calc on router switch.
811

912
### Fixes
1013

src/.angular-cli.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
"scripts": [
5959
"../../../node_modules/prismjs/prism.js",
6060
"../../../node_modules/prismjs/components/prism-bash.js",
61-
"../../../node_modules/prismjs/components/prism-typescript.js"
61+
"../../../node_modules/prismjs/components/prism-typescript.js",
62+
"../../../node_modules/prismjs/components/prism-json.js"
6263
],
6364
"environmentSource": "environments/environment.ts",
6465
"environments": {
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
<section class="pc-main-content">
2-
<router-outlet></router-outlet>
3-
</section>
4-
1+
<a routerLink="/" routerLinkActive="active">
2+
Charts
3+
</a>
4+
<a routerLink="/test" routerLinkActive="active">
5+
Test
6+
</a>
7+
<router-outlet></router-outlet>

src/apps/dev/src/app/app.module.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { AppComponent } from './app.component';
99
import { PcRepository } from './repository/pc.repository';
1010
import { PcService } from './services/pc.service';
1111
import { ChartsComponent } from './pages/charts/charts.component';
12+
import { TestComponent } from './pages/test/test.component';
1213

1314
/**
1415
* Pioneer Charts
@@ -24,13 +25,16 @@ import {
2425
} from '@pioneer-code/pioneer-charts';
2526

2627
const appRoutes: Routes = [
27-
{ path: '**', component: ChartsComponent }
28+
{ path: '', redirectTo: 'charts', pathMatch: 'full'},
29+
{ path: 'charts', component: ChartsComponent },
30+
{ path: 'test', component: TestComponent }
2831
];
2932

3033
@NgModule({
3134
declarations: [
3235
AppComponent,
33-
ChartsComponent
36+
ChartsComponent,
37+
TestComponent
3438
],
3539
imports: [
3640
RouterModule.forRoot(appRoutes),
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<section class="charts-content">
2+
<div class="container">
3+
<div class="row">
4+
<div class="col-sm">
5+
<div class="pc-chart-container">
6+
<pcac-header [config]="{'title':'Table'}"></pcac-header>
7+
<pcac-table [config]="pcService.tableConfig"></pcac-table>
8+
</div>
9+
</div>
10+
</div>
11+
</div>
12+
</section>

src/apps/dev/src/app/pages/test/test.component.scss

Whitespace-only changes.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { Component } from '@angular/core';
2+
import { PcService } from '../../services/pc.service';
3+
4+
@Component({
5+
selector: 'pc-test',
6+
templateUrl: './test.component.html',
7+
styleUrls: ['./test.component.scss']
8+
})
9+
export class TestComponent {
10+
constructor(public pcService: PcService) { }
11+
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
@import "../imports";
2-
.pc-main-content {
3-
}
2+

src/apps/docs/src/app/app.module.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ import { NavComponent } from './components/nav/nav.component';
5252
import { FooterComponent } from './components/footer/footer.component';
5353
import { DocNavComponent } from './components/doc-nav/dov-nav.component';
5454

55+
/**
56+
* Pipes
57+
*/
58+
import { StringifyPipe } from './pipes/stringify.pipe';
59+
5560
/**
5661
* Pioneer Charts
5762
*/
@@ -99,7 +104,8 @@ const appRoutes: Routes = [
99104
ThemeComponent,
100105
DataContractComponent,
101106
PublicComponent,
102-
JumpNavComponent
107+
JumpNavComponent,
108+
StringifyPipe
103109
],
104110
imports: [
105111
RouterModule.forRoot(appRoutes),

src/apps/docs/src/app/components/prism/prism.component.ts

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import {
33
AfterViewInit,
44
Input,
55
ElementRef,
6-
Renderer2
6+
Renderer2,
7+
OnChanges
78
} from '@angular/core';
89

910
@Component({
1011
selector: 'pc-prism',
11-
template: ``,
12-
styleUrls: ['./prism.component.scss']
12+
template: ``
1313
})
14-
export class PrismComponent implements AfterViewInit {
14+
export class PrismComponent implements OnChanges {
1515
@Input() code: string;
1616
@Input() language: string;
1717
private preNode: Element;
@@ -22,14 +22,16 @@ export class PrismComponent implements AfterViewInit {
2222
this.nativeElement = _el.nativeElement;
2323
}
2424

25-
ngAfterViewInit() {
26-
this.preNode = this._renderer.createElement('pre');
27-
this.codeNode = this._renderer.createElement('code');
28-
this._renderer.addClass(this.codeNode, 'language-' + this.language);
29-
this._renderer.addClass(this.preNode, 'pc-prism');
30-
this._renderer.appendChild(this.nativeElement, this.preNode);
31-
this._renderer.appendChild(this.preNode, this.codeNode);
32-
this.codeNode.textContent = this.code;
33-
Prism.highlightElement(this.codeNode, Prism.languages[this.language]);
25+
ngOnChanges() {
26+
if (this.code && this.language) {
27+
this.preNode = this._renderer.createElement('pre');
28+
this.codeNode = this._renderer.createElement('code');
29+
this._renderer.addClass(this.codeNode, 'language-' + this.language);
30+
this._renderer.addClass(this.preNode, 'pc-prism');
31+
this._renderer.appendChild(this.nativeElement, this.preNode);
32+
this._renderer.appendChild(this.preNode, this.codeNode);
33+
this.codeNode.textContent = this.code;
34+
Prism.highlightElement(this.codeNode, Prism.languages[this.language]);
35+
}
3436
}
3537
}

0 commit comments

Comments
 (0)