Skip to content

Commit

Permalink
fix(*): minors bugs, locale
Browse files Browse the repository at this point in the history
  • Loading branch information
mbarbeau committed Aug 29, 2019
1 parent 53045c0 commit 730df39
Show file tree
Hide file tree
Showing 31 changed files with 345 additions and 185 deletions.
1 change: 0 additions & 1 deletion demo/src/app/geo/layer/layer.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<igo-layer-list
[layers]="map.layers"
[expandLegendOfVisibleLayers]="false"
placeholder="Filter"
floatLabel="never"
[queryBadge]="true">

Expand Down
6 changes: 2 additions & 4 deletions demo/src/app/geo/time-filter/time-filter.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<mat-card-title>Time filter</mat-card-title>
<mat-card-content>
<li>npm install --save [email protected]</li>
<li>npm install --save @mat-datetimepicker/core@2.0.1</li>
<li>npm install --save @mat-datetimepicker/core@3.0.0-beta.0</li>
<li>Dependencies: LanguageService</li>

<br>
Expand All @@ -16,9 +16,7 @@
</igo-map-browser>

<igo-panel title="Layers">
<igo-time-filter-list [layers]="map.layers">

</igo-time-filter-list>
<igo-time-filter-list [layers]="map.layers"></igo-time-filter-list>
</igo-panel>

</mat-card>
70 changes: 39 additions & 31 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"@angular/platform-browser": "^7.2.6",
"@angular/platform-browser-dynamic": "^7.2.6",
"@angular/router": "^7.2.6",
"@mat-datetimepicker/core": "^3.0.0-beta.0",
"@mdi/angular-material": "^3.6.95",
"@ngx-translate/core": "^10.0.1",
"@turf/helpers": "^6.1.4",
Expand All @@ -91,7 +92,7 @@
"jspdf": "^1.5.3",
"jszip": "^3.1.5",
"jwt-decode": "^2.2.0",
"moment": "^2.24.0",
"moment": "^2.22.2",
"ngx-cacheable": "^1.0.9",
"ol": "^5.3.0",
"proj4": "^2.5.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<button mat-list-avatar
mat-icon-button
igoStopPropagation
[matTooltip]="'igo.context.contextManager.favorite' | translate"
[matTooltip]="auth.authenticated ? ('igo.context.contextManager.favorite' | translate) : ''"
matTooltipShowDelay="500"
[color]="default ? 'primary' : 'default'"
(click)="favoriteClick(context)">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
color="accent"
[selected]="selectedContext && selectedContext.uri === context.uri"
[context]="context"
[default]="this.defaultContextId === context.id"
[default]="context.id && this.defaultContextId && this.defaultContextId === context.id"
(edit)="edit.emit(context)"
(delete)="delete.emit(context)"
(clone)="clone.emit(context)"
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/style/themes/blue.theme.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$primary: mat-palette($mat-blue, 700);
$accent: mat-palette($mat-grey, 300);
$accent: mat-palette($mat-blue, 200);
$warn: mat-palette($mat-red);

$theme: mat-light-theme(
Expand Down
3 changes: 2 additions & 1 deletion packages/geo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@
"rxjs": "^6.4.0"
},
"optionalDependencies": {
"@mat-datetimepicker/core": "^3.0.0-beta.0",
"file-saver": "^1.3.8",
"html2canvas": "^1.0.0-alpha.12",
"jspdf": "^1.5.3",
"jszip": "^3.1.5",
"moment": "^2.24.0",
"stream": "^0.0.2"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ <h4 matLine>{{title}}</h4>
igoListItem
[layer]="item"
[added]="state.get(item).added"
[disabled]="state.get(item).added"
(addedChange)="onLayerAddedChange($event)">
</igo-catalog-browser-layer>
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
igoListItem
[layer]="item"
[added]="store.state.get(item).added"
[disabled]="store.state.get(item).added"
(addedChange)="onLayerAddedChange($event)">
</igo-catalog-browser-layer>
</ng-container>
Expand Down
Loading

0 comments on commit 730df39

Please sign in to comment.