Browse Source

Merge branch 'master' into feature/plugins

pull/349/head
Sebastian Stehle 7 years ago
parent
commit
8f8b6fa9ed
  1. 15
      CHANGELOG.md
  2. 2
      README.md
  3. 16
      src/Squidex/app/framework/angular/forms/autocomplete.component.ts
  4. 4
      src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts
  5. 8
      src/Squidex/app/shared/state/roles.forms.ts
  6. 20
      src/Squidex/package-lock.json

15
CHANGELOG.md

@ -1,7 +1,20 @@
# Changelog
## v1.16.0 - 2019-02-23
## v1.16.2 - 2019-03-16
### Bugfixes
* **UI**: Corrections for auto completions.
* **UI**: Correctly close onboarding tooltips.
## v1.16.1 - 2019-03-08
### Bugfixes
* **UI**: Multiple placeholders for interpolation.
* **UI**: Fix for button activation when adding rules.
## v1.16.0 - 2019-02-23
### Features

2
README.md

@ -16,7 +16,7 @@ Please join our community forum: https://support.squidex.io
## Status
Current Version 1.16.0. Roadmap: https://trello.com/b/KakM4F3S/squidex-roadmap
Current Version 1.16.2. Roadmap: https://trello.com/b/KakM4F3S/squidex-roadmap
## Prerequisites

16
src/Squidex/app/framework/angular/forms/autocomplete.component.ts

@ -21,6 +21,8 @@ const KEY_ESCAPE = 27;
const KEY_UP = 38;
const KEY_DOWN = 40;
const NO_EMIT = { emitEvent: false };
export const SQX_AUTOCOMPLETE_CONTROL_VALUE_ACCESSOR: any = {
provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => AutocompleteComponent), multi: true
};
@ -118,9 +120,9 @@ export class AutocompleteComponent extends StatefulControlComponent<State, any[]
this.resetForm();
} else {
if (this.displayProperty && this.displayProperty.length > 0) {
this.queryInput.setValue(obj[this.displayProperty]);
this.queryInput.setValue(obj[this.displayProperty], NO_EMIT);
} else {
this.queryInput.setValue(obj.toString());
this.queryInput.setValue(obj.toString(), NO_EMIT);
}
}
@ -130,9 +132,9 @@ export class AutocompleteComponent extends StatefulControlComponent<State, any[]
public setDisabledState(isDisabled: boolean): void {
if (isDisabled) {
this.reset();
this.queryInput.disable();
this.queryInput.disable(NO_EMIT);
} else {
this.queryInput.enable();
this.queryInput.enable(NO_EMIT);
}
}
@ -165,9 +167,9 @@ export class AutocompleteComponent extends StatefulControlComponent<State, any[]
if (selection) {
try {
if (this.displayProperty && this.displayProperty.length > 0) {
this.queryInput.setValue(selection[this.displayProperty], { emitEvent: false });
this.queryInput.setValue(selection[this.displayProperty], NO_EMIT);
} else {
this.queryInput.setValue(selection.toString(), { emitEvent: false });
this.queryInput.setValue(selection.toString(), NO_EMIT);
}
this.callChange(selection);
} finally {
@ -201,7 +203,7 @@ export class AutocompleteComponent extends StatefulControlComponent<State, any[]
}
private resetForm() {
this.queryInput.setValue('');
this.queryInput.setValue('', NO_EMIT);
}
private reset() {

4
src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts

@ -100,12 +100,12 @@ export class OnboardingTooltipComponent extends StatefulComponent implements OnD
public hideThis() {
this.onboardingService.disable(this.helpId);
this.unsubscribeAll();
this.ngOnDestroy();
}
public hideAll() {
this.onboardingService.disableAll();
this.unsubscribeAll();
this.ngOnDestroy();
}
}

8
src/Squidex/app/shared/state/roles.forms.ts

@ -7,7 +7,11 @@
import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { Form, hasValue$ } from '@app/framework';
import {
Form,
hasNoValue$,
hasValue$
} from '@app/framework';
export class EditPermissionsForm extends Form<FormArray> {
constructor() {
@ -50,7 +54,7 @@ export class AddPermissionForm extends Form<FormGroup> {
}
export class AddRoleForm extends Form<FormGroup> {
public hasNoName = hasValue$(this.form.controls['name']);
public hasNoName = hasNoValue$(this.form.controls['name']);
constructor(formBuilder: FormBuilder) {
super(formBuilder.group({

20
src/Squidex/package-lock.json

@ -5539,7 +5539,8 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
@ -5550,7 +5551,8 @@
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
@ -5667,7 +5669,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
@ -5679,6 +5682,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@ -5701,12 +5705,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@ -5725,6 +5731,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@ -5805,7 +5812,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
@ -5817,6 +5825,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@ -5938,6 +5947,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",

Loading…
Cancel
Save