Add idClass and upgrade webpack to v2

Author: Anthropic

README.md

@@ -23,18 +23,16 @@ or
 ```sh
 npm install angular-schema-form-bootstrap
 ```
-And then include `angular-schema-form-bootstrap.min.js`. Note that angular-schema-form >= 1.0.0-alpha.1 is needed.
+And then include `angular-schema-form-bootstrap-bundled.min.js`. Note that angular-schema-form >= 1.0.0-alpha.1 is needed.
 
-You **DO NOT** need to include angular-schema-form with this version, it is now embedded within the above file.
+You **DO NOT** need to include angular-schema-form with this version, it is now embedded within the above file. If you wish to include the files separately you can still use `angular-schema-form-bootstrap.min.js`
 
 Future
 ------
 Using the new builder opens up for a lot of optimization. Primarily we can get rid of a lot of small
 watches by using build helpers. For instance, slapping on a `sf-changed` directive *only* if the
 form definition has an `onChange` option.
 
-We also intend to provide a version that can be added as just the decorator without including Angular Schema Form.
-
 Developer Install
 -----------------
 ```sh

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

@@ -56,6 +56,12 @@
   "form": [
     {
       "key": "transportCategory",
+      "type": "tabarray",
+      "add": "New",
+      "style": {
+        "add": "btn-success"
+      },
+      "title": "{{ 'Tab '+$index + ' ' + value.mode + ' ' || 'Tab' + $index }}",
       "items": [
         "transportCategory[].mode",
         {

dist/angular-schema-form-bootstrap.js

@@ -241,10 +241,12 @@ <h3>Schema</h3>
 
   $scope.tests = [
     { name: "Simple", data: 'data/simple.json' },
+    { name: "Simple oneOf", data: 'data/simple-oneOf.json' },
     { name: "Basic JSON Schema Type", data: 'data/types.json' },
     { name: "Bootstrap Grid", data: 'data/grid.json' },
     { name: "Complex Key Support", data: 'data/complex-keys.json' },
     { name: "Array", data: 'data/array.json' },
+    { name: "Deep Array", data: 'data/array-deep.json' },
     { name: "Tab Array", data: 'data/tabarray.json' },
     { name: "TitleMap Examples", data: 'data/titlemaps.json' },
     { name: "Kitchen Sink", data: 'data/sink.json' },

examples/data/array-deep.json

@@ -1,15 +1,14 @@
 {
   "name": "angular-schema-form-bootstrap",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.5",
   "description": "Bootstrap 3 decorator for Angular Schema Form",
   "main": "dist/bootstrap-decorator.js",
   "scripts": {
-    "dist": "npm run build && npm run minify",
     "build": "webpack",
+    "dist": "webpack --config webpack.config.dist.js",
     "watch": "webpack --watch",
-    "minify": "uglifyjs dist/angular-schema-form-bootstrap.js --comments --output=dist/angular-schema-form-bootstrap.min.js && uglifyjs dist/angular-schema-form-bootstrap-bundled.js --comments --output=dist/angular-schema-form-bootstrap-bundled.min.js",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "test-not-yet-done": "karma start --single-run --browsers PhantomJS karma.conf.js --log-level info"
+    "test": "echo \"Error: test not currently available\" && exit 1",
+    "test-me": "karma start --log-level debug"
   },
   "keywords": [
     "angular-schema-form-decorator"
@@ -24,7 +23,6 @@
     "angular": ">= 1.2",
     "angular-messages": "^1.5.0",
     "angular-sanitize": ">= 1.2",
-    "angular-schema-form": "git://github.com/json-schema-form/angular-schema-form.git#feature/webpack-babel",
     "tv4": "~1.0.15"
   },
   "devDependencies": {
@@ -35,16 +33,6 @@
     "babel-preset-es2015": "^6.16.0",
     "chai": "^3.5.0",
     "coveralls": "^2.11.0",
-    "gulp": "^3.9.0",
-    "gulp-angular-templatecache": "^1.6.0",
-    "gulp-concat": "^2.5.2",
-    "gulp-jscs": "^3.0.2",
-    "gulp-minify-html": "^1.0.2",
-    "gulp-protractor": "^3.0.0",
-    "gulp-rename": "^1.2.2",
-    "gulp-uglify": "^1.2.0",
-    "gulp-watch": "^4.2.4",
-    "gulp-webserver": "^0.9.1",
     "html": "^1.0.0",
     "html-loader": "^0.4.4",
     "html-webpack-plugin": "^2.22.0",
@@ -64,7 +52,7 @@
     "sinon-chai": "^2.8.0",
     "streamqueue": "^0.1.3",
     "uglify-js": "^2.6.2",
-    "webpack": "^1.13.1",
-    "webpack-dev-server": "^1.14.1"
+    "webpack": "^2.1.0-beta.27",
+    "webpack-dev-server": "^2.1.0-beta.12"
   }
 }

examples/bootstrap-example.html examples/example.htmlexamples/bootstrap-example.html renamed to examples/example.html

@@ -1,20 +1,20 @@
 // angular-templatecache-loader
-let textareaTemplate = require('./bootstrap/textarea.html');
-let fieldsetTemplate = require('./bootstrap/fieldset.html');
-let arrayTemplate = require('./bootstrap/array.html');
-let tabarrayTemplate = require('./bootstrap/tabarray.html');
-let tabsTemplate = require('./bootstrap/tabs.html');
-let sectionTemplate = require('./bootstrap/section.html');
-let actionsTemplate = require('./bootstrap/actions.html');
-let selectTemplate = require('./bootstrap/select.html');
-let checkboxTemplate = require('./bootstrap/checkbox.html');
-let checkboxesTemplate = require('./bootstrap/checkboxes.html');
-let submitTemplate = require('./bootstrap/submit.html');
-let radiosTemplate = require('./bootstrap/radios.html');
-let radiosInlineTemplate = require('./bootstrap/radios-inline.html');
-let radiobuttonsTemplate = require('./bootstrap/radio-buttons.html');
-let helpTemplate = require('./bootstrap/help.html');
-let defaultTemplate = require('./bootstrap/default.html');
+import textareaTemplate from './bootstrap/textarea.html';
+import fieldsetTemplate from './bootstrap/fieldset.html';
+import arrayTemplate from './bootstrap/array.html';
+import tabarrayTemplate from './bootstrap/tabarray.html';
+import tabsTemplate from './bootstrap/tabs.html';
+import sectionTemplate from './bootstrap/section.html';
+import actionsTemplate from './bootstrap/actions.html';
+import selectTemplate from './bootstrap/select.html';
+import checkboxTemplate from './bootstrap/checkbox.html';
+import checkboxesTemplate from './bootstrap/checkboxes.html';
+import submitTemplate from './bootstrap/submit.html';
+import radiosTemplate from './bootstrap/radios.html';
+import radiosInlineTemplate from './bootstrap/radios-inline.html';
+import radiobuttonsTemplate from './bootstrap/radio-buttons.html';
+import helpTemplate from './bootstrap/help.html';
+import defaultTemplate from './bootstrap/default.html';
 
 angular
   .module('schemaForm')

npm-debug.log

@@ -1 +1 @@
-<div class="btn-group schema-form-actions {{::form.htmlClass}}" ng-transclude></div>
+<div class="btn-group schema-form-actions {{::form.htmlClass + ' ' + idClass}}" ng-transclude></div>

package.json

@@ -1,4 +1,4 @@
-<div class="btn-group schema-form-actions {{::form.htmlClass}}">
+<div class="btn-group schema-form-actions {{::form.htmlClass + ' ' + idClass}}">
   <input ng-repeat-start="item in form.items"
          type="submit"
          class="btn {{ item.style || 'btn-default' }} {{::form.fieldHtmlClass}}"