From 37cf56a2b3233fe617115dd5b0c76e42537eaa2c Mon Sep 17 00:00:00 2001 From: Alex M Date: Tue, 13 Sep 2016 00:53:50 +0300 Subject: [PATCH 1/2] [Documentation] Add extra controls --- docs/src/guide/index.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/src/guide/index.md b/docs/src/guide/index.md index 308ca6d2c1..1d8a422299 100644 --- a/docs/src/guide/index.md +++ b/docs/src/guide/index.md @@ -933,7 +933,7 @@ 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. @@ -941,7 +941,13 @@ Six standard control types are included in the forms bundle: * `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: From d490693bad9deebfca6a1e8922b9c093e0d8d5f8 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Tue, 13 Sep 2016 10:33:32 -0700 Subject: [PATCH 2/2] [Build] Update to es6-promise 3.3.0 ...including changes to filename associated with that version. Fixes #1183 --- bower.json | 2 +- main.js | 2 +- test-main.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index 670cbd4b70..922eb905f3 100644 --- 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/main.js b/main.js index 58ea2b1756..3fc2c4da36 100644 --- a/main.js +++ b/main.js @@ -27,7 +27,7 @@ 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", + "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 index 0e28eb5661..43142766b9 100644 --- a/test-main.js +++ b/test-main.js @@ -53,7 +53,7 @@ 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", + "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",