Skip to content
This repository was archived by the owner on Aug 25, 2020. It is now read-only.

Commit bdb7744

Browse files
author
Tim Mierzwa
authored
Merge pull request #76 from LabShare/disableform
Merge
2 parents c3a5ae9 + 7a221d5 commit bdb7744

File tree

7 files changed

+6
-17
lines changed

7 files changed

+6
-17
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ script:
1919
- npm run lint
2020
- xvfb-run npm run coverage
2121
- codecov
22-
- cat ./test/ui/coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
2322
cache:
2423
directories:
2524
- ~/.npm

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
[![Greenkeeper badge](https://badges.greenkeeper.io/LabShare/ngx-forms.svg?token=4a12f6b1da0f082ac1bbf2c72bbcaf01b001705746c61c36eee1db6bda3d7c11&ts=1528346534395)](https://greenkeeper.io/)
2-
[![Coverage Status](https://coveralls.io/repos/github/LabShare/ngx-forms/badge.svg?t=K1oUbj)](https://coveralls.io/github/LabShare/ngx-forms)
32
[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
43
[![Build Status](https://travis-ci.com/LabShare/ngx-forms.svg?token=zsifsALL6Np5avzzjVp1&branch=master)](https://travis-ci.com/LabShare/ngx-forms)
54

dist/ngx-forms.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
"@ngtools/webpack": "^1.3.3",
4444
"@types/jasmine": "^3.0.0",
4545
"@types/node": "^10.3.0",
46-
"coveralls": "^3.0.1",
4746
"css-loader": "^1.0.0",
4847
"html-loader": "0.5.5",
4948
"html-webpack-plugin": "3.2.0",

src/app/components/dynamic-field/dynamic-field.directive.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ComponentRef, Directive, Input, OnChanges, OnInit, ViewContainerRef, ComponentFactoryResolver, OnDestroy, Optional, Host, SkipSelf } from '@angular/core';
2-
import { FormGroup, ControlContainer } from '@angular/forms';
2+
import { FormGroup } from '@angular/forms';
33
import { Field } from '../../models/field.interface';
44
import { IFieldConfig } from '../../models/field-config.interface';
55
import { DynamicFieldService } from '../../services/dynamic-field.service';
@@ -15,7 +15,6 @@ export class DynamicFieldDirective implements Field, OnChanges, OnInit, OnDestro
1515
component: ComponentRef<any>;
1616

1717
constructor(
18-
@Optional() @Host() @SkipSelf() private parent: ControlContainer,
1918
private resolver: ComponentFactoryResolver,
2019
private container: ViewContainerRef,
2120
private dynamicFieldService: DynamicFieldService,

src/app/components/form-text-editor/form-text-editor.component.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
1-
import { Component, OnInit, ViewChild, forwardRef } from '@angular/core';
2-
import { FormGroup, ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
1+
import { Component} from '@angular/core';
2+
import { FormGroup} from '@angular/forms';
33
import { Field } from '../../models/field.interface';
44
import { IFieldConfig } from '../../models/field-config.interface';
5-
import { QuillEditorComponent } from 'ngx-quill';
65

76
@Component({
87
selector: 'form-text-editor',
98
template: require('./form-text-editor.component.html'),
109
styles: [require('./form-text-editor.component.scss').toString()],
11-
providers: [
12-
{
13-
provide: NG_VALUE_ACCESSOR,
14-
useExisting: forwardRef(() => FormTextEditorComponent),
15-
multi: true,
16-
},
17-
],
1810
})
1911
export class FormTextEditorComponent implements Field {
2012
field: IFieldConfig;
2113
group: FormGroup;
2214
model: object;
2315

24-
private quillToolbar: object = {
16+
public quillToolbar: object = {
2517
toolbar: ['bold', 'italic', 'underline', 'strike', { 'header': 1 }, { 'header': 2 }, { 'list': 'ordered' }, { 'list': 'bullet' }, 'blockquote', 'code-block', 'link']
2618
};
2719

src/app/models/field-config.interface.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ export interface IFieldConfig {
1616
pattern?: RegExp;
1717
lookup?: string; // Name of a lookup array inside lookup payload
1818
extract?: string; // Extract one field from lookup item when lookup is an object
19+
settings?: any; // Free format object for storing custom form inputs settings
1920
}

0 commit comments

Comments
 (0)