Skip to content

Support ['null', other_type] type. Fix #146 #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 10, 2015
Merged

Support ['null', other_type] type. Fix #146 #292

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions src/services/schema-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@
*/
angular.module('schemaForm').provider('schemaForm',
['sfPathProvider', function(sfPathProvider) {
var stripNullType = function(type) {
if (Array.isArray(type) && type.length == 2) {
if (type[0] === 'null')
return type[1];
if (type[1] === 'null')
return type[0];
}
return type;
}

//Creates an default titleMap list from an enum, i.e. a list of strings.
var enumToTitleMap = function(enm) {
Expand Down Expand Up @@ -35,7 +44,7 @@ angular.module('schemaForm').provider('schemaForm',
};

var defaultFormDefinition = function(name, schema, options) {
var rules = defaults[schema.type];
var rules = defaults[stripNullType(schema.type)];
if (rules) {
var def;
for (var i = 0; i < rules.length; i++) {
Expand Down Expand Up @@ -88,7 +97,7 @@ angular.module('schemaForm').provider('schemaForm',
};

var text = function(name, schema, options) {
if (schema.type === 'string' && !schema['enum']) {
if (stripNullType(schema.type) === 'string' && !schema['enum']) {
var f = stdFormObj(name, schema, options);
f.key = options.path;
f.type = 'text';
Expand All @@ -100,7 +109,7 @@ angular.module('schemaForm').provider('schemaForm',
//default in json form for number and integer is a text field
//input type="number" would be more suitable don't ya think?
var number = function(name, schema, options) {
if (schema.type === 'number') {
if (stripNullType(schema.type) === 'number') {
var f = stdFormObj(name, schema, options);
f.key = options.path;
f.type = 'number';
Expand All @@ -110,7 +119,7 @@ angular.module('schemaForm').provider('schemaForm',
};

var integer = function(name, schema, options) {
if (schema.type === 'integer') {
if (stripNullType(schema.type) === 'integer') {
var f = stdFormObj(name, schema, options);
f.key = options.path;
f.type = 'number';
Expand All @@ -120,7 +129,7 @@ angular.module('schemaForm').provider('schemaForm',
};

var checkbox = function(name, schema, options) {
if (schema.type === 'boolean') {
if (stripNullType(schema.type) === 'boolean') {
var f = stdFormObj(name, schema, options);
f.key = options.path;
f.type = 'checkbox';
Expand All @@ -130,7 +139,7 @@ angular.module('schemaForm').provider('schemaForm',
};

var select = function(name, schema, options) {
if (schema.type === 'string' && schema['enum']) {
if (stripNullType(schema.type) === 'string' && schema['enum']) {
var f = stdFormObj(name, schema, options);
f.key = options.path;
f.type = 'select';
Expand All @@ -143,7 +152,7 @@ angular.module('schemaForm').provider('schemaForm',
};

var checkboxes = function(name, schema, options) {
if (schema.type === 'array' && schema.items && schema.items['enum']) {
if (stripNullType(schema.type) === 'array' && schema.items && schema.items['enum']) {
var f = stdFormObj(name, schema, options);
f.key = options.path;
f.type = 'checkboxes';
Expand All @@ -156,7 +165,7 @@ angular.module('schemaForm').provider('schemaForm',
};

var fieldset = function(name, schema, options) {
if (schema.type === 'object') {
if (stripNullType(schema.type) === 'object') {
var f = stdFormObj(name, schema, options);
f.type = 'fieldset';
f.items = [];
Expand Down Expand Up @@ -188,7 +197,7 @@ angular.module('schemaForm').provider('schemaForm',

var array = function(name, schema, options) {

if (schema.type === 'array') {
if (stripNullType(schema.type) === 'array') {
var f = stdFormObj(name, schema, options);
f.type = 'array';
f.key = options.path;
Expand Down Expand Up @@ -386,7 +395,7 @@ angular.module('schemaForm').provider('schemaForm',
ignore = ignore || {};
globalOptions = globalOptions || {};

if (schema.type === 'object') {
if (stripNullType(schema.type) === 'object') {
angular.forEach(schema.properties, function(v, k) {
if (ignore[k] !== true) {
var required = schema.required && schema.required.indexOf(k) !== -1;
Expand Down