ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-17 06:38:17 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'master' into open933

Browse Source
This commit is contained in:
Henry
2016-09-13 13:25:37 -07:00
parent a1331b7bb3 f73238787d
commit 11e06039ec
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -13,7 +13,7 @@
"moment-duration-format": "^1.3.0", "moment-duration-format": "^1.3.0",
"requirejs": "~2.1.22", "requirejs": "~2.1.22",
"text": "requirejs-text#^2.0.14", "text": "requirejs-text#^2.0.14",
"es6-promise": "^3.0.2", "es6-promise": "^3.3.0",
"screenfull": "^3.0.0", "screenfull": "^3.0.0",
"node-uuid": "^1.4.7", "node-uuid": "^1.4.7",
"comma-separated-values": "^3.6.4", "comma-separated-values": "^3.6.4",

8
docs/src/guide/index.md
View File

@ -933,7 +933,7 @@ Note that `templateUrl` is not supported for `containers`.
Controls provide options for the `mct-control` directive. 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. * `textfield`: An area to enter plain text.
* `select`: A drop-down list of options. * `select`: A drop-down list of options.
@ -942,6 +942,12 @@ Six standard control types are included in the forms bundle:
* `button`: A button. * `button`: A button.
* `datetime`: An input for UTC date/time entry; gives result as a UNIX * `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 New controls may be added as extensions of the controls category. Extensions of
this category have two properties: this category have two properties:

2
main.js
View File

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

2
test-main.js
View File

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