Skip to content

Commit 204d5bb

Browse files
committed
Merge branch 'release/v0.7.2'
2 parents 339f6b4 + 36afb3f commit 204d5bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1225
-13083
lines changed

.jscs.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"preset": "google",
3+
"maximumLineLength": 100
4+
}

.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
language: node_js
22
node_js:
33
- 0.10
4+
5+
before_script:
6+
- npm install -g bower
7+
- bower install

CHANGELOG

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
v0.7.2
2+
------
3+
* Add-ons now have their own repos, and there is a colorpicker!
4+
* 'arrayIndex' is exposed as a locals in conditionals
5+
* New tab in tabarrays gets focus.
6+
* We now follow google javscript code guidelines, policed by jscs.
7+
18
v0.7.1
29
------
310
Thanks to @torstenrudolf, this release is basically his PR:s.

README.md

+37-13
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ You can also just download the contents of the `dist/` folder and add dependenci
9494

9595
### Dependencies
9696

97-
Schema form has a lot of dependencies, most of which are optional. Therefor
98-
99-
Schema Form depends on:
97+
Schema form has a lot of dependencies, most of which are optional. Schema Form depends on:
10098

10199
1. [AngularJS](https://angularjs.org/) version 1.3.x is recomended. Version 1.2.x
102100
has some limitation. See [known limitations](docs/knownlimitations.md).
@@ -109,19 +107,40 @@ If you install via bower you get all of the above except bootstrap since we
109107
don't want to push a certain version or flavor on you. Also make
110108
sure you got the angular version you actually want.
111109

110+
112111
#### Additional dependecies
113112

114-
1. If you want to use the date picker, you'll also need [jQuery](https://github.com/jquery/jquery) and [pickadate.js](http://amsul.ca/pickadate.js/)
115-
2. If you'd like to use drag-and-drop reordering of arrays, you'll also need [ui-sortable](https://github.com/angular-ui/ui-sortable) and its [jQueryUI](http://jqueryui.com/) dependencies. See the *ui-sortable* documentation for details about which parts of jQueryUI are needed. You can safely ignore these if you don't need reordering.
116-
3. Schema Form provides tabbed arrays through the form type `tabarray`. Tab arrays default to tabs on the left side. For these to work, you'll need to include the CSS from [bootstrap-vertical-tabs](https://github.com/dbtek/bootstrap-vertical-tabs). However, you won't need Bootstrap Vertical Tabs for horizontal tabs (the `tabType: "top"` option).
113+
1. If you'd like to use drag-and-drop reordering of arrays, you'll also need [ui-sortable](https://github.com/angular-ui/ui-sortable) and its [jQueryUI](http://jqueryui.com/) dependencies. See the *ui-sortable* documentation for details about which parts of jQueryUI are needed. You can safely ignore these if you don't need reordering.
114+
2. Schema Form provides tabbed arrays through the form type `tabarray`. Tab arrays default to tabs on the left side. For these to work, you'll need to include the CSS from [bootstrap-vertical-tabs](https://github.com/dbtek/bootstrap-vertical-tabs). However, you won't need Bootstrap Vertical Tabs for horizontal tabs (the `tabType: "top"` option).
117115

118116
The minified files include templates - no need to load additional HTML files.
119117

118+
119+
### Script Loading
120+
121+
Schema form is split into two main files, `dist/schema-form.min.js` and
122+
`dist/boostrap-decorator.min.js` and they need be loaded in that order. AngularJ,
123+
[tv4](https://github.com/geraintluff/tv4) and [objectpath](https://github.com/mike-marcacci/objectpath)
124+
also needs to be loaded *before* Schema Form.
125+
126+
127+
```html
128+
<script type="text/javascript" src="../bower_components/angular/angular.min.js"></script>
129+
<script type="text/javascript" src="../bower_components/angular-sanitize/angular-sanitize.min.js"></script>
130+
<script type="text/javascript" src="bower_components/tv4/tv4.js"></script>
131+
<script type="text/javascript" src="bower_components/objectpath/lib/ObjectPath.js"></script>
132+
<script type="text/javascript" src="bower_components/angular-schema-form/dist/schema-form.min.js"></script>
133+
<script type="text/javascript" src="bower_components/angular-schema-form/dist/bootstrap-decorator.min.js"></script>
134+
```
135+
136+
120137
Add-ons
121138
------
122-
There is currently only one add-on, a date picker using the excellent [pickadate.js](http://amsul.ca/pickadate.js/).
139+
There is currently two add-ons, a date picker and a colorpicker. They have their own repos and you
140+
can find them here with usage instructions:
123141

124-
See the [add-on docs](docs/datepicker.md) for usage.
142+
* [https://github.com/Textalk/angular-schema-form-datepicker](https://github.com/Textalk/angular-schema-form-datepicker)
143+
* [https://github.com/Textalk/angular-schema-form-colorpicker](https://github.com/Textalk/angular-schema-form-colorpicker)
125144

126145
Building
127146
--------
@@ -147,19 +166,24 @@ Unit tests are run with [karma](http://karma-runner.github.io) and written using
147166
To run the tests:
148167

149168
1. Install all dependencies via NPM
150-
2. Install the Karma CLI
151-
3. Run the tests
169+
2. Install dev dependencies with bower.
170+
3. Install the Karma CLI
171+
4. Run the tests
152172

153173
```bash
154174
$ npm install
175+
$ bower install
155176
$ sudo npm install -g karma-cli
156177
$ karma start karma.conf.js
157178
```
158179

159180
Contributing
160181
------------
161182

162-
**Heads up!** Sometime soon we will go over and change the code style to follow
163-
whatever [jscs](https://github.com/mdevils/node-jscs) says with preset set to 'google'.
183+
All contributions are welcome! We're trying to use
184+
[git flow](http://danielkummer.github.io/git-flow-cheatsheet/), so please base any merge request
185+
on the **development** branch instead of **master**.
164186

165-
All contributions are welcome! We're trying to use [git flow](http://danielkummer.github.io/git-flow-cheatsheet/), so please base any merge request on the **development** branch instead of **master**.
187+
Also run any code through the code style checker [jscs](https://github.com/mdevils/node-jscs)
188+
(or even better use it in your editor) with preset set to `google`. You can also us `gulp jscs` to
189+
check your code.

bower.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"dist/bootstrap-decorator.min.js",
66
"dist/bootstrap-datepicker.min.js"
77
],
8-
"version": "0.7.1",
8+
"version": "0.7.2",
99
"authors": [
1010
"Textalk",
1111
"David Jensen <[email protected]>"
@@ -36,6 +36,10 @@
3636
"objectpath": "~1.0.4"
3737
},
3838
"devDependencies": {
39-
"angular-ui-ace": "bower"
39+
"angular-ui-ace": "bower",
40+
"angular-schema-form-datepicker": ">= 0.1.0",
41+
"jquery": "~2.1.1",
42+
"angular-mocks": ">= 1.2",
43+
"angular-schema-form-colorpicker": "~0.1.0"
4044
}
4145
}

dist/bootstrap-datepicker.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)