Skip to content

Commit 7408170

Browse files
AnthropicAnthropic
committed
Remove key generator as that's in ASF now
1 parent cdafe11 commit 7408170

File tree

3 files changed

+38
-86
lines changed

3 files changed

+38
-86
lines changed

‎dist/angular-schema-form-bootstrap-bundled.js‎

Lines changed: 35 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* angular-schema-form-bootstrap
33
* @version 1.0.0-alpha.1
4-
* @date Sat, 14 Jan 2017 17:11:45 GMT
4+
* @date Sun, 29 Jan 2017 00:45:28 GMT
55
* @link https://github.com/json-schema-form/angular-schema-form-bootstrap
66
* @license MIT
77
* Copyright (c) 2014-2017 JSON Schema Form
@@ -280,8 +280,7 @@ module.exports = path;
280280

281281
angular
282282
.module('schemaForm')
283-
.config(bootstrapDecoratorConfig)
284-
.filter('sfCamelKey', sfCamelKeyFilter);
283+
.config(bootstrapDecoratorConfig);
285284

286285
bootstrapDecoratorConfig.$inject = [
287286
'schemaFormProvider', 'schemaFormDecoratorsProvider', 'sfBuilderProvider', 'sfPathProvider', '$injector'
@@ -375,23 +374,6 @@ function bootstrapDecoratorConfig(
375374
}, []);
376375
};
377376

378-
/**
379-
* sfCamelKey Filter
380-
*/
381-
function sfCamelKeyFilter() {
382-
return function(formKey) {
383-
if (!formKey) { return ''; };
384-
var part, i, key;
385-
key = formKey.slice();
386-
for (i = 0; i < key.length; i++) {
387-
part = key[i].toLowerCase().split('');
388-
if (i && part.length) { part[0] = part[0].toUpperCase(); };
389-
key[i] = part.join('');
390-
};
391-
return key.join('');
392-
};
393-
};
394-
395377

396378
/***/ },
397379
/* 18 */
@@ -400,7 +382,7 @@ function sfCamelKeyFilter() {
400382
/*!
401383
* angular-schema-form
402384
* @version 1.0.0-alpha.1
403-
* @date Sat, 14 Jan 2017 17:09:44 GMT
385+
* @date Mon, 23 Jan 2017 13:42:17 GMT
404386
* @link https://github.com/json-schema-form/angular-schema-form
405387
* @license MIT
406388
* Copyright (c) 2014-2017 JSON Schema Form
@@ -484,7 +466,7 @@ module.exports = angular;
484466
/*!
485467
* json-schema-form-core
486468
* @version 1.0.0-alpha.1
487-
* @date Sat, 14 Jan 2017 17:07:51 GMT
469+
* @date Mon, 16 Jan 2017 13:06:10 GMT
488470
* @link https://github.com/json-schema-form/json-schema-form-core
489471
* @license MIT
490472
* Copyright (c) 2014-2017 JSON Schema Form
@@ -954,21 +936,21 @@ function defaultForm(schema, defaultSchemaTypes, ignore, globalOptions) {
954936
/***/ function(module, exports, __webpack_require__) {
955937

956938
"use strict";
957-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__schema_defaults__ = __webpack_require__(3);
958-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__sf_path__ = __webpack_require__(0);
959-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__canonical_title_map__ = __webpack_require__(1);
960-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__merge__ = __webpack_require__(5);
961-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__select__ = __webpack_require__(6);
962-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__traverse__ = __webpack_require__(7);
963-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__validate__ = __webpack_require__(8);
939+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__lib_schema_defaults__ = __webpack_require__(3);
940+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__lib_sf_path__ = __webpack_require__(0);
941+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__lib_canonical_title_map__ = __webpack_require__(1);
942+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__lib_merge__ = __webpack_require__(5);
943+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__lib_select__ = __webpack_require__(6);
944+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__lib_traverse__ = __webpack_require__(7);
945+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__lib_validate__ = __webpack_require__(8);
964946
/* harmony export (binding) */ __webpack_require__.d(exports, "sfPath", function() { return sfPath; });
965947
/* harmony export (binding) */ __webpack_require__.d(exports, "schemaDefaults", function() { return schemaDefaults; });
966948
/* harmony export (binding) */ __webpack_require__.d(exports, "canonicalTitleMap", function() { return canonicalTitleMap; });
967-
/* harmony reexport (binding) */ __webpack_require__.d(exports, "merge", function() { return __WEBPACK_IMPORTED_MODULE_3__merge__["a"]; });
968-
/* harmony reexport (binding) */ __webpack_require__.d(exports, "select", function() { return __WEBPACK_IMPORTED_MODULE_4__select__["a"]; });
969-
/* harmony reexport (binding) */ __webpack_require__.d(exports, "traverseSchema", function() { return __WEBPACK_IMPORTED_MODULE_5__traverse__["a"]; });
970-
/* harmony reexport (binding) */ __webpack_require__.d(exports, "traverseForm", function() { return __WEBPACK_IMPORTED_MODULE_5__traverse__["b"]; });
971-
/* harmony reexport (binding) */ __webpack_require__.d(exports, "validate", function() { return __WEBPACK_IMPORTED_MODULE_6__validate__["a"]; });
949+
/* harmony reexport (binding) */ __webpack_require__.d(exports, "merge", function() { return __WEBPACK_IMPORTED_MODULE_3__lib_merge__["a"]; });
950+
/* harmony reexport (binding) */ __webpack_require__.d(exports, "select", function() { return __WEBPACK_IMPORTED_MODULE_4__lib_select__["a"]; });
951+
/* harmony reexport (binding) */ __webpack_require__.d(exports, "traverseSchema", function() { return __WEBPACK_IMPORTED_MODULE_5__lib_traverse__["a"]; });
952+
/* harmony reexport (binding) */ __webpack_require__.d(exports, "traverseForm", function() { return __WEBPACK_IMPORTED_MODULE_5__lib_traverse__["b"]; });
953+
/* harmony reexport (binding) */ __webpack_require__.d(exports, "validate", function() { return __WEBPACK_IMPORTED_MODULE_6__lib_validate__["a"]; });
972954

973955

974956

@@ -978,9 +960,9 @@ function defaultForm(schema, defaultSchemaTypes, ignore, globalOptions) {
978960

979961

980962

981-
var sfPath = __WEBPACK_IMPORTED_MODULE_1__sf_path__;
982-
var schemaDefaults = __WEBPACK_IMPORTED_MODULE_0__schema_defaults__;
983-
var canonicalTitleMap = __WEBPACK_IMPORTED_MODULE_2__canonical_title_map__["a" /* default */];
963+
var sfPath = __WEBPACK_IMPORTED_MODULE_1__lib_sf_path__;
964+
var schemaDefaults = __WEBPACK_IMPORTED_MODULE_0__lib_schema_defaults__;
965+
var canonicalTitleMap = __WEBPACK_IMPORTED_MODULE_2__lib_canonical_title_map__["a" /* default */];
984966

985967
/***/ },
986968
/* 5 */
@@ -1128,6 +1110,7 @@ function select(projection, obj, valueToSet) {
11281110
if (typeof valueToSet !== 'undefined' && parts.length === 1) {
11291111
// special case, just setting one variable
11301112
obj[parts[0]] = valueToSet;
1113+
11311114
return obj;
11321115
};
11331116

@@ -1137,12 +1120,14 @@ function select(projection, obj, valueToSet) {
11371120
};
11381121

11391122
var value = obj[parts[0]];
1123+
11401124
for (var i = 1; i < parts.length; i++) {
11411125
// Special case: We allow JSON Form syntax for arrays using empty brackets
11421126
// These will of course not work here so we exit if they are found.
11431127
if (parts[i] === '') {
11441128
return undefined;
1145-
}
1129+
};
1130+
11461131
if (typeof valueToSet !== 'undefined') {
11471132
if (i === parts.length - 1) {
11481133
// last step. Let's set the value
@@ -1152,19 +1137,22 @@ function select(projection, obj, valueToSet) {
11521137
// Make sure to create new objects on the way if they are not there.
11531138
// We need to look ahead to check if array is appropriate
11541139
var tmp = value[parts[i]];
1140+
11551141
if (typeof tmp === 'undefined' || tmp === null) {
11561142
tmp = numRe.test(parts[i + 1]) ? [] : {};
11571143
value[parts[i]] = tmp;
1158-
}
1144+
};
1145+
11591146
value = tmp;
1160-
}
1147+
};
11611148
} else if (value) {
11621149
// Just get nex value.
11631150
value = value[parts[i]];
1164-
}
1165-
}
1151+
};
1152+
};
1153+
11661154
return value;
1167-
}
1155+
};
11681156

11691157
/***/ },
11701158
/* 7 */
@@ -1521,7 +1509,6 @@ __WEBPACK_IMPORTED_MODULE_1_angular___default.a.module('schemaForm', deps)
15211509
// Validate against the schema.
15221510

15231511
var validate = function validate(viewValue) {
1524-
//console.log('validate called', viewValue)
15251512
//Still might be undefined
15261513
if (!form) {
15271514
return viewValue;
@@ -1602,9 +1589,10 @@ __WEBPACK_IMPORTED_MODULE_1_angular___default.a.module('schemaForm', deps)
16021589

16031590
// A bit ugly but useful.
16041591
scope.validateField = function (formName) {
1592+
var noField = formName === undefined;
16051593
// If we have specified a form name, and this model is not within
16061594
// that form, then leave things be.
1607-
if (formName != undefined && ngModel.$$parentForm.$name !== formName) {
1595+
if (!noField && ngModel.$$parentForm.$name !== formName) {
16081596
return;
16091597
}
16101598

@@ -1613,9 +1601,9 @@ __WEBPACK_IMPORTED_MODULE_1_angular___default.a.module('schemaForm', deps)
16131601
// Just setting the viewValue isn't enough to trigger validation
16141602
// since it's the same value. This will be better when we drop
16151603
// 1.2 support.
1616-
if (schema && schema.type.indexOf('array') !== -1) {
1604+
if (noField || schema && schema.type.indexOf('array') !== -1) {
16171605
validate(ngModel.$modelValue);
1618-
}
1606+
};
16191607

16201608
// We set the viewValue to trigger parsers,
16211609
// since modelValue might be empty and validating just that

‎dist/angular-schema-form-bootstrap.js‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* angular-schema-form-bootstrap
33
* @version 1.0.0-alpha.1
4-
* @date Sat, 14 Jan 2017 17:11:45 GMT
4+
* @date Sun, 29 Jan 2017 00:45:28 GMT
55
* @link https://github.com/json-schema-form/angular-schema-form-bootstrap
66
* @license MIT
77
* Copyright (c) 2014-2017 JSON Schema Form
@@ -280,8 +280,7 @@ module.exports = path;
280280

281281
angular
282282
.module('schemaForm')
283-
.config(bootstrapDecoratorConfig)
284-
.filter('sfCamelKey', sfCamelKeyFilter);
283+
.config(bootstrapDecoratorConfig);
285284

286285
bootstrapDecoratorConfig.$inject = [
287286
'schemaFormProvider', 'schemaFormDecoratorsProvider', 'sfBuilderProvider', 'sfPathProvider', '$injector'
@@ -375,23 +374,6 @@ function bootstrapDecoratorConfig(
375374
}, []);
376375
};
377376

378-
/**
379-
* sfCamelKey Filter
380-
*/
381-
function sfCamelKeyFilter() {
382-
return function(formKey) {
383-
if (!formKey) { return ''; };
384-
var part, i, key;
385-
key = formKey.slice();
386-
for (i = 0; i < key.length; i++) {
387-
part = key[i].toLowerCase().split('');
388-
if (i && part.length) { part[0] = part[0].toUpperCase(); };
389-
key[i] = part.join('');
390-
};
391-
return key.join('');
392-
};
393-
};
394-
395377

396378
/***/ },
397379
/* 18 */,

‎src/bootstrap-decorator.js‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ import textareaTemplate from './bootstrap/textarea.html';
1818

1919
angular
2020
.module('schemaForm')
21-
.config(bootstrapDecoratorConfig)
22-
.filter('sfCamelKey', sfCamelKeyFilter);
21+
.config(bootstrapDecoratorConfig);
2322

2423
bootstrapDecoratorConfig.$inject = [
2524
'schemaFormProvider', 'schemaFormDecoratorsProvider', 'sfBuilderProvider', 'sfPathProvider', '$injector'
@@ -112,20 +111,3 @@ function bootstrapDecoratorConfig(
112111
textarea: {template: textareaTemplate, builder: defaults},
113112
}, []);
114113
};
115-
116-
/**
117-
* sfCamelKey Filter
118-
*/
119-
function sfCamelKeyFilter() {
120-
return function(formKey) {
121-
if (!formKey) { return ''; };
122-
var part, i, key;
123-
key = formKey.slice();
124-
for (i = 0; i < key.length; i++) {
125-
part = key[i].toLowerCase().split('');
126-
if (i && part.length) { part[0] = part[0].toUpperCase(); };
127-
key[i] = part.join('');
128-
};
129-
return key.join('');
130-
};
131-
};

0 commit comments

Comments
 (0)