Merge remote-tracking branch 'refs/remotes/origin/feature/webpack-babel' into development

# Conflicts: #	CONTRIBUTING.md #	README.md #	dist/schema-form.js #	dist/schema-form.min.js #	docs/index.md #	gulp/tasks/minify.js #	package.json #	src/directives/field.js #	src/directives/schema-form.js #	src/directives/schema-validate.js #	src/directives/sf-array.directive.js #	src/directives/sf-schema.directive.spec.js #	src/services/schema-form-decorators.provider.js #	src/services/schema-form.js #	src/services/sf-builder.provider.js

Author: Anthropic

.babelrc

@@ -0,0 +1,5 @@
+{
+ "presets": [
+ ["es2015", { "modules": false }]
+ ]
+}

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 coverage
 bower_components
+*.log

.jscs.json

@@ -1,5 +1,15 @@
 {
  "preset": "google",
- "maximumLineLength": 100,
- "disallowMultipleLineBreaks": false
+ "disallowSpacesInsideObjectBrackets": null,
+ "requireSpacesInsideObjectBrackets": {
+ "allExcept": [ "[", "]", "{", "}" ]
+ },
+ "disallowSpacesInsideArrayBrackets": null,
+ "requireSpacesInsideArrayBrackets": {
+ "allExcept": [ "[", "]", "{", "}" ]
+ },
+ "disallowKeywordsOnNewLine": [ ],
+ "disallowMultipleVarDecl": null,
+ "maximumLineLength": 120,
+ "requireSemicolons": true
 }

.jshintrc

@@ -2,11 +2,9 @@
  "undef": true,
  "unused": true,
  "browser": true,
+ "esnext":true, 
  "globals": {
- "ObjectPath": false,
  "console":false,
- "jQuery": false,
- "$":false,
  "assertEquals": false,
  "jstestdriver": false,
  "assertTrue": false,
@@ -17,7 +15,6 @@
  "sinon":false,
  "beforeEach": false,
  "afterEach": false,
- "angular": false,
  "module": false,
  "inject": false,
  "chai": false,

CONTRIBUTING.md

@@ -6,12 +6,12 @@ We love contributions!
 
 The reason for this is that we're trying to use
 [git flow](http://danielkummer.github.io/git-flow-cheatsheet/), and it makes merging your pull
-request heck of a lot easier for us.
+request a heck of a lot easier for us.
 
-Please avoid including anything from the `dist/` directory as that can make merging harder, and we
+Please **avoid including anything from the `dist/`** directory as that can make merging harder, and we
 always generate these files when we make a new release.
 
-**We're currently in transitioning where a large part of the code, i.e. the bootstrap decorator, has been moved to it's own repo. It's here [github.com/Textalk/angular-schema-form-bootstrap](https://github.com/Textalk/angular-schema-form-bootstrap)**
+**The bootstrap decorator, has been moved to it's own repo. It's here [github.com/json-schema-form/angular-schema-form-bootstrap](https://github.com/json-schema-form/angular-schema-form-bootstrap)**
 
 Feel free to submit issues on the main repo anyway though.
 
@@ -22,5 +22,5 @@ With new features we love to see updates to the docs as well as tests, that make
 easy and fast for us to merge it!
 
 Also consider running any code through the code style checker [jscs](https://github.com/mdevils/node-jscs)
-(or even better use it in your editor) with preset set to `google`. You can also use `gulp jscs` to
-check your code.
+(or even better use it in your editor) with preset set to `google`. You can also
+use `gulp jscs` to check your code. I hope to set up ESLint in the not too distant future.

README.md

@@ -9,6 +9,30 @@ Angular Schema Form
 
 Generate forms from JSON schemas using AngularJS!
 
+Branch Status & New Add-On
+--------------------------
+This branch will be the **next version of Angular Schema Form**, currently please use
+the **examples/example.html** file as the best example to get the framework working.
+
+The example uses **schema-form.js** and **angular-schema-form-bootstrap.js** for the
+version of the code it executes, if you want your page to behave the same you
+obviously need the same version!
+
+The new Webpack compilation has made it easier to manage files and code and run build
+scripts, but it is still not easy enough for users unfamiliar with it... yet.
+
+**NOTE** in order to work simultaneously with ```json-schema-form-core``` you must have it cloned
+as a sibling directory to this one to build this library **OR** npm install the version you wish to build with.
+
+Webpack now generates a header to indicate version and date of build. **Do not create PR with the DIST folder.**
+
+### Add-on
+To see how to make an **add-on** work I have now included the **calculate** add-on file within the **examples/add-on** directory.
+
+## Yet to be migrated
+Currently **copyValueTo** and some **array** related features are not working as expected and remain the highest priority to ensure backwards compatibility is maintained where possible.
+
+
 The Update
 ==========
 Current development is occuring on the [feature/webpack-babel](https://github.com/json-schema-form/angular-schema-form/blob/feature/webpack-babel/README.md) branch. Once that is stable and passing all tests again it will be replace the current developer branch. Ideally any new PRs should target the new version to avoid migration issues.

bower.json

@@ -1,9 +1,6 @@
 {
  "name": "angular-schema-form",
- "main": [
- "dist/schema-form.js",
- "dist/bootstrap-decorator.js"
- ],
+ "main": "dist/schema-form.js",
  "authors": [
  "Textalk",
  "David Jensen <david.lgj@gmail.com>",
@@ -41,8 +38,7 @@
  "dependencies": {
  "angular": ">= 1.2",
  "tv4": "~1.0.15",
- "angular-sanitize": ">= 1.2",
- "objectpath": "~1.1.0"
+ "angular-sanitize": ">= 1.2"
  },
  "devDependencies": {
  "angular-ui-ace": "bower",
@@ -54,5 +50,8 @@
  "angular-ui-sortable": ">=0.12.11",
  "bootstrap-vertical-tabs": "~1.2.0",
  "angular-schema-form-bootstrap": "~0.1.1"
+ },
+ "resolutions": {
+ "jquery": "~2.1.1"
  }
 }