Skip to content

Commit 213ebf7

Browse files
committed
Merge branch 'development' of github.com:Textalk/angular-schema-form into development
2 parents ce6cf7c + abcda2f commit 213ebf7

File tree

3 files changed

+19
-4
lines changed

3 files changed

+19
-4
lines changed

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ bower install angular-schema-form
107107
This will install the latest release and basic dependencies. See
108108
[dependecies section below](#dependencies).
109109

110+
You can also load the files via [cdnjs.com](https://cdnjs.com/libraries/angular-schema-form).
111+
110112
### Manual
111113

112114
You can also just download the contents of the `dist/` folder and add dependencies manually.
@@ -138,7 +140,7 @@ The minified files include templates - no need to load additional HTML files.
138140
### Script Loading
139141

140142
Schema form is split into two main files, `dist/schema-form.min.js` and
141-
`dist/boostrap-decorator.min.js` and they need be loaded in that order. AngularJ,
143+
`dist/boostrap-decorator.min.js` and they need be loaded in that order. AngularJS,
142144
[tv4](https://github.com/geraintluff/tv4) and [objectpath](https://github.com/mike-marcacci/objectpath)
143145
also needs to be loaded *before* Schema Form.
144146

package.json

+14-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"description": "Create complex forms from a JSON schema with angular.",
55
"repository": "Textalk/angular-schema-form",
66
"main": "dist/schema-form.min.js",
7-
"homepage": "http://textalk.github.io/angular-schema-form/",
7+
"filename": "dist/schema-form.min.js",
8+
"homepage": "http://schemaform.io",
89
"scripts": {
910
"test": "rm -fr coverage && ./node_modules/karma/bin/karma start --single-run --browsers PhantomJS karma.conf.js && find coverage/ -name lcov.info -print0 | xargs -0 cat | ./node_modules/coveralls/bin/coveralls.js"
1011
},
@@ -61,5 +62,16 @@
6162
"type": "MIT",
6263
"url": "https://raw.githubusercontent.com/Textalk/angular-schema-form/master/LICENSE"
6364
}
64-
]
65+
],
66+
"autoupdate": {
67+
"source": "git",
68+
"target": "git://github.com/Textalk/angular-schema-form.git",
69+
"basePath": "/dist/",
70+
"files": [
71+
"schema-form.min.js",
72+
"schema-form.js",
73+
"bootstrap-decorator.min.js",
74+
"bootstrap-decorator.js"
75+
]
76+
}
6577
}

src/services/schema-form.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ angular.module('schemaForm').provider('schemaForm',
182182
path: path,
183183
required: required || false,
184184
lookup: options.lookup,
185-
ignore: options.ignore
185+
ignore: options.ignore,
186+
global: options.global
186187
});
187188
if (def) {
188189
f.items.push(def);

0 commit comments

Comments
 (0)