Skip to content

Commit a4f0ea8

Browse files
authored
Merge branch 'development' into development
2 parents 4615c14 + 7c9fff5 commit a4f0ea8

32 files changed

+1951
-1663
lines changed

.eslintrc.json

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"env": {
3+
"browser": true,
4+
"node": true
5+
},
6+
"parserOptions": {
7+
"ecmaVersion": 6,
8+
"sourceType": "module"
9+
},
10+
"extends": "google",
11+
"rules": {
12+
"array-bracket-spacing": [
13+
2,
14+
"always",
15+
{
16+
"objectsInArrays": false,
17+
"arraysInArrays": false
18+
}
19+
],
20+
"object-curly-spacing": [
21+
2,
22+
"always",
23+
{
24+
"objectsInObjects": false,
25+
"arraysInObjects": false
26+
}
27+
],
28+
"brace-style": [
29+
2,
30+
"stroustrup",
31+
{
32+
"allowSingleLine": true
33+
}
34+
],
35+
"max-len": [
36+
2,
37+
120,
38+
{ "ignoreStrings": true }
39+
],
40+
"semi": [
41+
2,
42+
"always"
43+
],
44+
"linebreak-style": "off",
45+
"space-before-function-paren": "off",
46+
"valid-jsdoc": "off",
47+
"no-invalid-this": "off"
48+
}
49+
}

CONTRIBUTING.md

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,25 @@ Contributing
88
<a name="setup"></a>
99
## How to setup to develop
1010
To get started clone all json-schema-form library repos into sibling folders.
11-
json-schema-form-core
12-
angular-schema-form
13-
angular-schema-form-bootstrap
14-
angular-schema-form-material
15-
11+
```bash
12+
git clone https://github.com/json-schema-form/json-schema-form-core.git
13+
git clone https://github.com/json-schema-form/angular-schema-form.git
14+
git clone https://github.com/json-schema-form/angular-schema-form-bootstrap.git
15+
git clone https://github.com/json-schema-form/angular-schema-form-material.git
16+
```
17+
Install dev/global dependencies and bower references to use demo site
18+
```bash
19+
npm install
20+
npm install -g webpack eslint mocha # json-schema-form-core
21+
npm install -g webpack eslint karma # angular-schema-form
22+
bower install
23+
```
1624
Once cloned each repo has npm commands for assisting development
1725
```bash
18-
# Run unit tests
19-
npm run test
20-
21-
# Run the build
22-
npm run build
23-
24-
# Run the build and minify
25-
npm run dist # not in json-schema-form-core
26-
27-
# Run the build and watch for changes
28-
npm run watch
26+
npm run test # Run unit tests
27+
npm run build # Run the build
28+
npm run dist # not in json-schema-form-core # Run the build and minify
29+
npm run watch # Run the build and watch for changes
2930
```
3031

3132
<a name="build"></a>

dist/angular-schema-form-bootstrap.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* angular-schema-form
33
* @version 1.0.0-alpha.5
4-
* @date Sat, 29 Apr 2017 14:53:54 GMT
4+
* @date Sun, 25 Jun 2017 09:09:24 GMT
55
* @link https://github.com/json-schema-form/angular-schema-form
66
* @license MIT
77
* Copyright (c) 2014-2017 JSON Schema Form
@@ -93,7 +93,7 @@ module.exports = __webpack_require__(3);
9393
/*!
9494
* angular-schema-form-bootstrap
9595
* @version 1.0.0-alpha.5
96-
* @date Sat, 29 Apr 2017 14:49:38 GMT
96+
* @date Sun, 30 Apr 2017 12:31:04 GMT
9797
* @link https://github.com/json-schema-form/angular-schema-form-bootstrap
9898
* @license MIT
9999
* Copyright (c) 2014-2017 JSON Schema Form
@@ -309,7 +309,7 @@ module.exports = __webpack_require__(3);
309309
/***/function (module, exports) {
310310

311311
var path = '/bootstrap/section.html';
312-
var html = "<div class=\"schema-form-section {{::form.htmlClass + ' ' + idClass}}\" sf-key-controller sf-parent-key=\"[{{form.key.join('][')}}]\" sf-index=\"{{$index}}\"></div>\r\n";
312+
var html = "<div class=\"schema-form-section {{::form.htmlClass + ' ' + idClass}}\" sf-index=\"{{$index}}\"></div>\r\n";
313313
window.angular.module('ng').run(['$templateCache', function (c) {
314314
c.put(path, html);
315315
}]);

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

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

0 commit comments

Comments
 (0)