Skip to content

Commit

Permalink
Merge pull request Fyrd#1 from NOtherDev/pr__add_image_capture
Browse files Browse the repository at this point in the history
Syntax errors fixes, minor formatting, CodePen fork ID
  • Loading branch information
yell0wd0g authored Aug 19, 2016
2 parents 0c9be60 + 26a9628 commit bff076f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions app/scripts/features.js
Original file line number Diff line number Diff line change
Expand Up @@ -1031,16 +1031,16 @@ self.addEventListener('fetch', function (event) {
description: [`The <b>Image Capture API</b> allows web applications to take pictures from a Web Cam, as well as manipulate the usual parameters such as zoom or focus points.`,],
api: `<dl>
<dt><code>capturer = ImageCapture(mediaStreamVideoTrack)</code></dt>
<dd>Creates an ImageCapturer out of the Media Stream Video Track.</dd>
<dd>Creates an image capturer out of the Media Stream Video Track.</dd>
<dt><code>capturer.takePhoto()</code></dt>
<dd>Returns a Promise resolved with the photo taken with the current settings.</dd>
<dd>Returns a <code>Promise</code> resolved with the photo taken with the current settings.</dd>
<dt><code>capturer.setOptions(photoSettings)</code></dt>
<dd>Configures the <code>photoSettings</code> for subsequent captures; if visible, the effects of the configuration can be seen in the Track used as input.</dd>
</dl>`,
tests: [Feature.rawTest('window', , () => { return (typeof(ImageCapture) == undefined) }],
demoPen: 'codepen.io/miguelao/pen/ZOkOQw',
tests: [Feature.windowContains('ImageCapture')],
demoPen: 'AXzVqV',
links: [
{url: 'https://w3c.github.io/mediacapture-image/', title: 'W3C Specification'},
{url: 'https://w3c.github.io/mediacapture-image/', title: 'W3C Specification Draft'},
{url: 'https://rawgit.com/Miguelao/demos/master/imagecapture.html', title: 'Demo'}
]
}),
Expand Down
6 changes: 3 additions & 3 deletions build/groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@
"id": "battery-status",
"icon": "mdi-device-battery-80",
"name": "Battery Status"
}
},
{
"id": "camera-microphone",
"id": "image-capture",
"icon": "mdi-image-camera-roll",
"name": "Image Capture"
},
}
]
},
{
Expand Down

0 comments on commit bff076f

Please sign in to comment.