Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8ce1ec1

Browse files
Add eslint
1 parent 3d840cb commit 8ce1ec1

File tree

3 files changed

+93
-4
lines changed

3 files changed

+93
-4
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+
}

‎package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "json-schema-form-core",
3-
"version": "1.0.0-alpha.4",
3+
"version": "1.0.0-alpha.5",
44
"description": "JSON-Schema and JSON-UI-Schema utilities for form generation.",
55
"main": "dist/json-schema-form-core.js",
66
"scripts": {
@@ -53,6 +53,8 @@
5353
"babel-preset-stage-0": "^6.22.0",
5454
"babel-register": "^6.18.0",
5555
"chai": "^3.5.0",
56+
"eslint": "^3.19.0",
57+
"eslint-config-google": "^0.7.1",
5658
"json-refs": "^2.1.6",
5759
"karma": "^1.3.0",
5860
"karma-babel-preprocessor": "^6.0.1",

‎src/lib/merge.spec.js

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,55 @@ describe('merge.js', () => {
161161

162162
var merged = merge(subschema, [{key: 'sub', readonly: true}]);
163163

164-
//sub
164+
//sub
165165
merged[0].should.have.property('readonly');
166166
merged[0].readonly.should.eq(true);
167167

168-
//array
168+
//array
169169
merged[0].items[0].should.have.property('readonly');
170170
merged[0].items[0].readonly.should.eq(true);
171171

172-
//array items
172+
//array items
173173
merged[0].items[0].items[0].should.have.property('readonly');
174174
merged[0].items[0].items[0].readonly.should.eq(true);
175175
});
176+
177+
it('should add x-schema-form properties', () => {
178+
let subschema = {
179+
"type": "object",
180+
"properties": {
181+
"comment": {
182+
"type": "string",
183+
"title": "Comment",
184+
"x-schema-form": {
185+
"type": "textarea",
186+
"placeholder": "Don't hold back"
187+
}
188+
}
189+
}
190+
};
191+
192+
var merged = merge(subschema, [ '*' ]);
193+
194+
merged.should.deep.eq(
195+
[
196+
{
197+
"title": "Comment",
198+
"schema": {
199+
"type": "string",
200+
"title":"Comment",
201+
"x-schema-form": {
202+
"type": "textarea",
203+
"placeholder": "Don't hold back"
204+
}
205+
},
206+
"ngModelOptions": {},
207+
"key": [ "comment" ],
208+
"type": "textarea",
209+
"placeholder": "Don't hold back"
210+
}
211+
]
212+
)
213+
});
176214
});
177215
});

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /