Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Commit

Permalink
Merge branch 'release/1.30.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
EndyKaufman committed Jan 12, 2018
2 parents a5712af + ab80b2a commit 80a3825
Show file tree
Hide file tree
Showing 15 changed files with 48 additions and 32 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
<a name="1.30.1"></a>
## [1.30.1](https://github.com/rucken/core/compare/1.30.0...1.30.1) (2018-01-12)


### Bug Fixes

* **base-resource-select-input:** Set default value for inputReadonly to false ([d70152a](https://github.com/rucken/core/commit/d70152a))
* **navbar:** Remove show changelog modal on first open site ([20d40e3](https://github.com/rucken/core/commit/20d40e3))
* **select-input:** Add ignore errors if item prop is readonly ([c4038fc](https://github.com/rucken/core/commit/c4038fc))



<a name="1.30.0"></a>
# [1.30.0](https://github.com/rucken/core/compare/1.29.1...1.30.0) (2018-01-10)

Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<meta charset="utf-8">
<title>Rucken: Demo</title>
<base href="/">
<meta name="version" content="1.30.0">
<meta name="version" content="1.30.1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link href="assets/css/please-wait.css" rel="stylesheet">
Expand Down
2 changes: 1 addition & 1 deletion libs/core/src/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rucken/core",
"version": "1.30.0",
"version": "1.30.1",
"description": "Core with base class and admin entities for application maked on Angular5+",
"keywords": [
"ngx",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class BaseResourceInputComponent extends BaseComponent {
@Input()
lookupTooltip?: string;
@Input()
lookupIcon?= 'fa fa-search';
lookupIcon = 'fa fa-search';
@Input()
readonly?: boolean;
@Input()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ import { BaseResourcesListComponent } from '../base-resources-list/base-resource
export class BaseResourceSelectInputComponent extends BaseResourcesListComponent {

@Input()
labelClass?= 'control-label';
labelClass = 'control-label';
@Input()
inputClass?= 'form-control';
inputClass = 'form-control';
@Input()
inputFrameClass?= '';
inputFrameClass = '';
@Input()
lookupTooltip?: string;
lookupTooltip: string;
@Input()
lookupIcon?= 'fa fa-search';
lookupIcon = 'fa fa-search';
@Input()
readonly?: boolean;
@Input()
Expand Down Expand Up @@ -103,7 +103,7 @@ export class BaseResourceSelectInputComponent extends BaseResourcesListComponent
this.hardReadonly = false;
}
if (this.inputReadonly === undefined) {
this.inputReadonly = true;
this.inputReadonly = false;
}
if (this.inputElement) {
this.inputElement.hardValue = this.hardValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import { BaseModalComponent } from './../../base-modal/base-modal.component';
export class BaseResourceListModalComponent extends BaseModalComponent {

@Input()
readonly?= false;
readonly = false;
@Input()
hardReadonly?= false;
hardReadonly = false;

item: any = {};
items: any[] = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ export class CheckboxesInputComponent extends BaseComponent {
inputElement: ElementRef;

@Input()
labelClass?= 'control-label';
labelClass = 'control-label';
@Input()
inputClass?= 'control-label checkbox-inline';
inputClass = 'control-label checkbox-inline';
@Input()
inputFrameClass?= 'form-control form-checkbox-controls';
inputFrameClass = 'form-control form-checkbox-controls';
@Input()
readonly = false;
@Input()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ export class GridRowButtonsComponent extends BaseComponent {
@Input()
removeTitle?: string;
@Input()
editIcon?= 'fa fa-pencil-square-o';
editIcon = 'fa fa-pencil-square-o';
@Input()
removeIcon?= 'fa fa-remove';
removeIcon = 'fa fa-remove';
@Input()
editIconColor?= ''; // text-primary';
editIconColor = ''; // text-primary';
@Input()
removeIconColor?= ''; // 'text-warning';
removeIconColor = ''; // 'text-warning';
@Output()
onEdit: EventEmitter<boolean> = new EventEmitter<boolean>();
@Output()
Expand Down
1 change: 0 additions & 1 deletion libs/web/src/controls/navbar/navbar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ export class NavbarComponent extends BaseComponent {
}
initVersion() {
if (this.app.localVersion !== this.app.currentVersion) {
this.showChangeLog();
this.app.localVersion = this.app.currentVersion;
}
}
Expand Down
6 changes: 3 additions & 3 deletions libs/web/src/controls/radios-input/radios-input.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ export class RadiosInputComponent extends BaseComponent {
inputElement: ElementRef;

@Input()
labelClass?= 'control-label';
labelClass = 'control-label';
@Input()
inputClass?= 'control-label checkbox-inline';
inputClass = 'control-label checkbox-inline';
@Input()
inputFrameClass?= 'form-control form-radio-controls';
inputFrameClass = 'form-control form-radio-controls';
@Input()
readonly = false;
@Input()
Expand Down
15 changes: 10 additions & 5 deletions libs/web/src/controls/select-input/select-input.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ export class SelectInputComponent extends BaseComponent {
inputElement: ElementRef;

@Input()
debounceTime?: number;
debounceTime: number;
@Output()
onChangeInputValue: EventEmitter<string> = new EventEmitter<string>();
@Output()
onInputFocus: EventEmitter<string> = new EventEmitter<string>();
@Input()
labelClass?= 'control-label';
labelClass = 'control-label';
@Input()
inputClass?= 'form-control';
inputClass = 'form-control';
@Input()
inputFrameClass?= '';
inputFrameClass = '';
@Input()
inFormGroup = true;
@Input()
Expand Down Expand Up @@ -73,7 +73,12 @@ export class SelectInputComponent extends BaseComponent {
return this.dataSource;
}
return this._items.map(item => {
item[this.inputTitleField] = this.getInputTitle(item);
// todo: refactor
try {
item[this.inputTitleField] = this.getInputTitle(item);
} catch (error) {

}
return item;
});
}
Expand Down
4 changes: 2 additions & 2 deletions libs/web/src/controls/text-input/text-input.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ export class TextInputComponent extends BaseComponent {
tooltip: TooltipDirective;

@Input()
labelClass?= 'control-label';
labelClass = 'control-label';
@Input()
inputClass?= 'form-control';
inputClass = 'form-control';
@Input()
inputFrameClass?: string;
@Input()
Expand Down
2 changes: 1 addition & 1 deletion libs/web/src/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rucken/web",
"version": "1.30.0",
"version": "1.30.1",
"description": "Base components, services and ui for admin entities for application maked on Angular5+",
"keywords": [
"ngx",
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rucken",
"version": "1.30.0",
"version": "1.30.1",
"license": "MIT",
"author": "EndyKaufman <[email protected]>",
"engines": {
Expand Down

0 comments on commit 80a3825

Please sign in to comment.