Skip to content

Commit 7868255

Browse files
Merge pull request dschnelldavis#154 from stalsma/master
Minor fixes
2 parents 88239c1 + ffb6508 commit 7868255

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

package-lock.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/demo/polyfills.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import 'core-js/es6/object';
2626
// import 'core-js/es6/parse-float';
2727
// import 'core-js/es6/number';
2828
// import 'core-js/es6/math';
29-
// import 'core-js/es6/string';
29+
import 'core-js/es6/string';
3030
// import 'core-js/es6/date';
3131
import 'core-js/es6/array';
3232
// import 'core-js/es6/regexp';

src/lib/src/framework-library/bootstrap-4-framework/bootstrap-4-framework.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import {
88
} from '../../shared';
99

1010
/**
11-
* Bootstrap 3 framework for Angular JSON Schema Form.
11+
* Bootstrap 4 framework for Angular JSON Schema Form.
1212
*
1313
*/
1414
@Component({
15-
selector: 'bootstrap-3-framework',
15+
selector: 'bootstrap-4-framework',
1616
template: `
1717
<div
1818
[class]="options?.htmlClass || ''"

src/lib/src/json-schema-form.service.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,10 @@ export class JsonSchemaFormService {
453453
'model', 'arrayIndices', layoutNode.options.condition.functionBody
454454
);
455455
result = dynFn(this.data, dataIndex);
456-
} catch (e) { }
456+
} catch (e) {
457+
result = true;
458+
console.error("condition functionBody errored out on evaluation: " + layoutNode.options.condition.functionBody);
459+
}
457460
}
458461
}
459462
return result;

src/lib/src/widget-library/section.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ import { JsonSchemaFormService } from '../json-schema-form.service';
5757
</fieldset>`,
5858
styles: [`
5959
.legend { font-weight: bold; }
60-
.expandable > legend:before { content: '▶'; padding-right: .3em; }
61-
.expanded > legend:before { content: '▼'; padding-right: .2em; }
60+
.expandable > legend:before, .expandable > label:before { content: '▶'; padding-right: .3em; }
61+
.expanded > legend:before, .expanded > label:before { content: '▼'; padding-right: .2em; }
6262
`],
6363
})
6464
export class SectionComponent implements OnInit {

src/lib/src/widget-library/tabs.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import { JsonSchemaFormService } from '../json-schema-form.service';
1414
role="presentation"
1515
data-tabs>
1616
<a *ngIf="showAddTab || item.type !== '$ref'"
17+
[class]="'nav-link' + (selectedItem === i ? (' ' + options?.activeClass + ' ' + options?.style?.selected) :
18+
(' ' + options?.style?.unselected))"
1719
[innerHTML]="setTabTitle(item, i)"
1820
(click)="select(i)"></a>
1921
</li>

0 commit comments

Comments
 (0)