Skip to content
This repository was archived by the owner on Jan 11, 2024. It is now read-only.

merge Master into develop #11

Merged
merged 13 commits into from
Mar 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ deployment:
production:
branch: master
commands:
- npm publish
- echo -e "$NPM_USERNAME\n$NPM_PASSWORD\n$NPM_EMAIL" | npm login
- npm run publish2npm
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"scripts": {
"build": "rm -rf dist/* && tsc",
"serve": "rm -rf dist/ && tsc -w",
"prepublish": "npm run build"
"prepublish": "npm run build",
"publish2npm": "publish"
},
"repository": {
"type": "git",
Expand All @@ -33,6 +34,7 @@
"@angular/core": "^2.3.1",
"@angular/forms": "^2.3.1",
"cz-conventional-changelog": "1.2.0",
"publish": "^0.6.0",
"rxjs": "^5.0.1",
"typescript": "~2.0.3",
"validate-commit-msg": "2.8.2"
Expand Down
4 changes: 4 additions & 0 deletions src/components/header.template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ export const HEADER_TEMPLATE = `
(click)="columnSelectorOpen = !columnSelectorOpen; $event.stopPropagation()" >
<i class="fa fa-list fa-lg"></i>
</button>
<button *ngIf="dataTable.showDownloadButton" type="button" class="btn btn-default btn-sm download-button"
(click)="dataTable.downloadItems()">
<i class="fa fa-download fa-lg"></i>
</button>
<div class="column-selector-wrapper" (click)="$event.stopPropagation()">
<div *ngIf="columnSelectorOpen" class="column-selector-box panel panel-default">
<div *ngIf="dataTable.expandableRows" class="column-selector-fixed-column checkbox">
Expand Down
8 changes: 8 additions & 0 deletions src/components/table.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ export class DataTable implements DataTableParams, OnInit {
@Input() selectOnRowClick = false;
@Input() autoReload = true;
@Input() showReloading = false;
@Input() showDownloadButton = false;

// UI state without input:

Expand Down Expand Up @@ -220,6 +221,13 @@ export class DataTable implements DataTableParams, OnInit {
});
}

// Download
@Output() download = new EventEmitter();

downloadItems(){
this.download.emit(this._getRemoteParameters());
}

// event handlers:

@Output() rowClick = new EventEmitter();
Expand Down
33 changes: 17 additions & 16 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,31 +1,32 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule} from '@angular/forms';

import { DataTable} from './components/table.component';
import { DataTableColumn } from './components/column.component';
import { DataTableRow } from './components/row.component';
import { DataTablePagination } from './components/pagination.component';
import { DataTableHeader } from './components/header.component';
import {DataTable} from './components/table.component';
import {DataTableColumn} from './components/column.component';
import {DataTableRow} from './components/row.component';
import {DataTablePagination} from './components/pagination.component';
import {DataTableHeader} from './components/header.component';

import { PixelConverter } from './utils/px';
import { Hide } from './utils/hide';
import { MinPipe } from './utils/min';
import {PixelConverter} from './utils/px';
import {Hide} from './utils/hide';
import {MinPipe} from './utils/min';

export * from './components/types';
export * from './tools/data-table-resource';

export { DataTable, DataTableColumn, DataTableRow, DataTablePagination, DataTableHeader };
export const DATA_TABLE_DIRECTIVES = [ DataTable, DataTableColumn ];
export {DataTable, DataTableColumn, DataTableRow, DataTablePagination, DataTableHeader};
export const DATA_TABLE_DIRECTIVES = [DataTable, DataTableColumn];


@NgModule({
imports: [ CommonModule, FormsModule ],
imports: [CommonModule, FormsModule],
declarations: [
DataTable, DataTableColumn,
DataTableRow, DataTablePagination, DataTableHeader,
PixelConverter, Hide, MinPipe
],
exports: [ DataTable, DataTableColumn ]
exports: [DataTable, DataTableColumn]
})
export class DataTableModule { }
export class DataTableModule {
}