Browse Source

Merge branch 'master' into feature-asset-management

pull/65/head
Sebastian Stehle 9 years ago
parent
commit
95fbc227c6
  1. 5
      src/Squidex/app/features/content/pages/content/content-field.component.ts
  2. 2
      src/Squidex/app/features/content/pages/content/content-page.component.ts
  3. 3
      src/Squidex/app/features/content/pages/contents/content-item.component.ts
  4. 3
      src/Squidex/app/features/schemas/pages/schema/field.component.ts
  5. 5
      src/Squidex/app/features/schemas/pages/schema/types/boolean-ui.component.ts
  6. 5
      src/Squidex/app/features/schemas/pages/schema/types/boolean-validation.component.ts
  7. 5
      src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.ts
  8. 5
      src/Squidex/app/features/schemas/pages/schema/types/date-time-validation.component.ts
  9. 5
      src/Squidex/app/features/schemas/pages/schema/types/geolocation-ui.component.ts
  10. 5
      src/Squidex/app/features/schemas/pages/schema/types/geolocation-validation.component.ts
  11. 5
      src/Squidex/app/features/schemas/pages/schema/types/json-ui.component.ts
  12. 5
      src/Squidex/app/features/schemas/pages/schema/types/json-validation.component.ts
  13. 5
      src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts
  14. 5
      src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts
  15. 5
      src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts
  16. 5
      src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts

5
src/Squidex/app/features/content/pages/content/content-field.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
import { Component, Input, OnInit } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { AppLanguageDto, FieldDto } from 'shared';
@ -13,8 +13,7 @@ import { AppLanguageDto, FieldDto } from 'shared';
@Component({
selector: 'sqx-content-field',
styleUrls: ['./content-field.component.scss'],
templateUrl: './content-field.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: './content-field.component.html'
})
export class ContentFieldComponent implements OnInit {
@Input()

2
src/Squidex/app/features/content/pages/content/content-page.component.ts

@ -137,6 +137,8 @@ export class ContentPageComponent extends AppComponentBase implements OnDestroy,
this.enable();
});
}
} else {
this.notifyError('Content element not valid, please check the field with the red bar on the left in all languages (if localizable).');
}
}

3
src/Squidex/app/features/content/pages/contents/content-item.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
import {
AppComponentBase,
@ -25,7 +25,6 @@ import {
selector: '[sqxContent]',
styleUrls: ['./content-item.component.scss'],
templateUrl: './content-item.component.html',
changeDetection: ChangeDetectionStrategy.OnPush,
animations: [
fadeAnimation
]

3
src/Squidex/app/features/schemas/pages/schema/field.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import {
@ -19,7 +19,6 @@ import {
selector: 'sqx-field',
styleUrls: ['./field.component.scss'],
templateUrl: './field.component.html',
changeDetection: ChangeDetectionStrategy.OnPush,
animations: [
fadeAnimation
]

5
src/Squidex/app/features/schemas/pages/schema/types/boolean-ui.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
import { Component, Input, OnInit } from '@angular/core';
import { FormControl, FormGroup, Validators } from '@angular/forms';
import { BooleanFieldPropertiesDto } from 'shared';
@ -13,8 +13,7 @@ import { BooleanFieldPropertiesDto } from 'shared';
@Component({
selector: 'sqx-boolean-ui',
styleUrls: ['boolean-ui.component.scss'],
templateUrl: 'boolean-ui.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: 'boolean-ui.component.html'
})
export class BooleanUIComponent implements OnInit {
@Input()

5
src/Squidex/app/features/schemas/pages/schema/types/boolean-validation.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
import { Component, Input, OnInit } from '@angular/core';
import { FormControl, FormGroup } from '@angular/forms';
import { Observable } from 'rxjs';
@ -14,8 +14,7 @@ import { BooleanFieldPropertiesDto } from 'shared';
@Component({
selector: 'sqx-boolean-validation',
styleUrls: ['boolean-validation.component.scss'],
templateUrl: 'boolean-validation.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: 'boolean-validation.component.html'
})
export class BooleanValidationComponent implements OnInit {
@Input()

5
src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
import { Component, Input, OnInit } from '@angular/core';
import { FormControl, FormGroup, Validators } from '@angular/forms';
import { Observable } from 'rxjs';
@ -14,8 +14,7 @@ import { FloatConverter, NumberFieldPropertiesDto } from 'shared';
@Component({
selector: 'sqx-date-time-ui',
styleUrls: ['date-time-ui.component.scss'],
templateUrl: 'date-time-ui.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: 'date-time-ui.component.html'
})
export class DateTimeUIComponent implements OnInit {
@Input()

5
src/Squidex/app/features/schemas/pages/schema/types/date-time-validation.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
import { Component, Input, OnInit } from '@angular/core';
import { FormControl, FormGroup } from '@angular/forms';
import { Observable } from 'rxjs';
@ -14,8 +14,7 @@ import { DateTimeFieldPropertiesDto, ValidatorsEx } from 'shared';
@Component({
selector: 'sqx-date-time-validation',
styleUrls: ['date-time-validation.component.scss'],
templateUrl: 'date-time-validation.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: 'date-time-validation.component.html'
})
export class DateTimeValidationComponent implements OnInit {
@Input()

5
src/Squidex/app/features/schemas/pages/schema/types/geolocation-ui.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
import { Component, Input, OnInit } from '@angular/core';
import { FormGroup, FormControl, Validators } from '@angular/forms';
import { GeolocationFieldPropertiesDto } from 'shared';
@ -13,8 +13,7 @@ import { GeolocationFieldPropertiesDto } from 'shared';
@Component({
selector: 'sqx-geolocation-ui',
styleUrls: ['geolocation-ui.component.scss'],
templateUrl: 'geolocation-ui.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: 'geolocation-ui.component.html'
})
export class GeolocationUIComponent implements OnInit {
@Input()

5
src/Squidex/app/features/schemas/pages/schema/types/geolocation-validation.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { Component, Input } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { GeolocationFieldPropertiesDto } from 'shared';
@ -13,8 +13,7 @@ import { GeolocationFieldPropertiesDto } from 'shared';
@Component({
selector: 'sqx-geolocation-validation',
styleUrls: ['geolocation-validation.component.scss'],
templateUrl: 'geolocation-validation.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: 'geolocation-validation.component.html'
})
export class GeolocationValidationComponent {
@Input()

5
src/Squidex/app/features/schemas/pages/schema/types/json-ui.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { Component, Input } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { JsonFieldPropertiesDto } from 'shared';
@ -13,8 +13,7 @@ import { JsonFieldPropertiesDto } from 'shared';
@Component({
selector: 'sqx-json-ui',
styleUrls: ['json-ui.component.scss'],
templateUrl: 'json-ui.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: 'json-ui.component.html'
})
export class JsonUIComponent {
@Input()

5
src/Squidex/app/features/schemas/pages/schema/types/json-validation.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { Component, Input } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { JsonFieldPropertiesDto } from 'shared';
@ -13,8 +13,7 @@ import { JsonFieldPropertiesDto } from 'shared';
@Component({
selector: 'sqx-json-validation',
styleUrls: ['json-validation.component.scss'],
templateUrl: 'json-validation.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: 'json-validation.component.html'
})
export class JsonValidationComponent {
@Input()

5
src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core';
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { FormControl, FormGroup, Validators } from '@angular/forms';
import { Observable, Subscription } from 'rxjs';
@ -14,8 +14,7 @@ import { FloatConverter, NumberFieldPropertiesDto } from 'shared';
@Component({
selector: 'sqx-number-ui',
styleUrls: ['number-ui.component.scss'],
templateUrl: 'number-ui.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: 'number-ui.component.html'
})
export class NumberUIComponent implements OnDestroy, OnInit {
private editorSubscription: Subscription;

5
src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
import { Component, Input, OnInit } from '@angular/core';
import { FormControl, FormGroup } from '@angular/forms';
import { Observable } from 'rxjs';
@ -14,8 +14,7 @@ import { NumberFieldPropertiesDto } from 'shared';
@Component({
selector: 'sqx-number-validation',
styleUrls: ['number-validation.component.scss'],
templateUrl: 'number-validation.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: 'number-validation.component.html'
})
export class NumberValidationComponent implements OnInit {
@Input()

5
src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core';
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { FormControl, FormGroup, Validators } from '@angular/forms';
import { Observable, Subscription } from 'rxjs';
@ -14,8 +14,7 @@ import { StringFieldPropertiesDto } from 'shared';
@Component({
selector: 'sqx-string-ui',
styleUrls: ['string-ui.component.scss'],
templateUrl: 'string-ui.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: 'string-ui.component.html'
})
export class StringUIComponent implements OnDestroy, OnInit {
private editorSubscription: Subscription;

5
src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts

@ -5,7 +5,7 @@
* Copyright (c) Sebastian Stehle. All rights reserved
*/
import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit } from '@angular/core';
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { FormControl, FormGroup } from '@angular/forms';
import { Observable, Subscription } from 'rxjs';
@ -14,8 +14,7 @@ import { StringFieldPropertiesDto } from 'shared';
@Component({
selector: 'sqx-string-validation',
styleUrls: ['string-validation.component.scss'],
templateUrl: 'string-validation.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
templateUrl: 'string-validation.component.html'
})
export class StringValidationComponent implements OnDestroy, OnInit {
private patternSubscription: Subscription;

Loading…
Cancel
Save