Merge branch 'master' into open933

nasa · Sep 13, 2016 · 11e0603 · 11e0603
2 parents a1331b7 + f732387
commit 11e0603
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/bower.json b/bower.json
@@ -13,7 +13,7 @@
     "moment-duration-format": "^1.3.0",
     "requirejs": "~2.1.22",
     "text": "requirejs-text#^2.0.14",
-    "es6-promise": "^3.0.2",
+    "es6-promise": "^3.3.0",
     "screenfull": "^3.0.0",
     "node-uuid": "^1.4.7",
     "comma-separated-values": "^3.6.4",

diff --git a/docs/src/guide/index.md b/docs/src/guide/index.md
@@ -933,15 +933,21 @@ Note that `templateUrl` is not supported for `containers`.
 
 Controls provide options for the `mct-control` directive. 
 
-Six standard control types are included in the forms bundle:
+Ten standard control types are included in the forms bundle:
 
 * `textfield`: An area to enter plain text.
 * `select`: A drop-down list of options.
 * `checkbox`: A box which may be checked/unchecked.
 * `color`: A color picker.
 * `button`: A button.
 * `datetime`: An input for UTC date/time entry; gives result as a UNIX 
-timestamp, in milliseconds since start of 1970, UTC. 
+timestamp, in milliseconds since start of 1970, UTC.
+* `composite`: A control parenting an array of other controls.
+* `menu-button`: A drop-down list of items supporting custom behavior
+on click.
+* `dialog-button`: A button which opens a dialog allowing a single property
+to be edited.
+* `radio`: A radio button.
 
 New controls may be added as extensions of the controls category. Extensions of 
 this category have two properties: 

diff --git a/main.js b/main.js
@@ -27,8 +27,8 @@ requirejs.config({
         "angular": "bower_components/angular/angular.min",
         "angular-route": "bower_components/angular-route/angular-route.min",
         "csv": "bower_components/comma-separated-values/csv.min",
-        "es6-promise": "bower_components/es6-promise/promise.min",
         "EventEmitter": "bower_components/eventemitter3/index",
+        "es6-promise": "bower_components/es6-promise/es6-promise.min",
         "html2canvas": "bower_components/html2canvas/build/html2canvas.min",
         "jsPDF": "bower_components/jspdf/dist/jspdf.min",
         "moment": "bower_components/moment/moment",

diff --git a/test-main.js b/test-main.js
@@ -53,8 +53,8 @@ requirejs.config({
         "angular": "bower_components/angular/angular.min",
         "angular-route": "bower_components/angular-route/angular-route.min",
         "csv": "bower_components/comma-separated-values/csv.min",
-        "es6-promise": "bower_components/es6-promise/promise.min",
         "EventEmitter": "bower_components/eventemitter3/index",
+        "es6-promise": "bower_components/es6-promise/es6-promise.min",
         "html2canvas": "bower_components/html2canvas/build/html2canvas.min",
         "jsPDF": "bower_components/jspdf/dist/jspdf.min",
         "moment": "bower_components/moment/moment",