EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2587 from crazyserver/MOBILE-3543 

Mobile 3543
main
Juan Leyva 2020-11-03 13:40:34 +01:00 committed by GitHub
parent 08b3dc4723 d2c7ee4b39
commit f2df105a48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package.json
View File

@ -261,14 +261,19 @@
} }
], ],
"compression": "maximum", "compression": "maximum",
"electronVersion": "4.2.5", "electronVersion": "8.0.2",
"mac": { "mac": {
"category": "public.app-category.education", "category": "public.app-category.education",
"icon": "resources/desktop/icon.icns", "icon": "resources/desktop/icon.icns",
"target": "mas", "target": "mas",
"bundleVersion": "3.9.3", "bundleVersion": "3.9.3",
"extendInfo": { "extendInfo": {
"ElectronTeamID": "2NU57U5PAW" "ElectronTeamID": "2NU57U5PAW",
"NSLocationWhenInUseUsageDescription": "We need your location so you can attach it as part of your submissions.",
"NSLocationAlwaysUsageDescription": "We need your location so you can attach it as part of your submissions.",
"NSCameraUsageDescription": "We need camera access to take pictures so you can attach them as part of your submissions.",
"NSMicrophoneUsageDescription": "We need microphone access to record sounds so you can attach them as part of your submissions.",
"NSPhotoLibraryUsageDescription": "We need photo library access to get pictures from there so you can attach them as part of your submissions."
} }
}, },
"win": { "win": {

6
src/core/emulator/pages/capture-media/capture-media.ts
View File

@ -192,7 +192,13 @@ export class CoreEmulatorCaptureMediaPage implements OnInit, OnDestroy {
}; };
// Set the stream as the source of the video. // Set the stream as the source of the video.
if ('srcObject' in this.streamVideo.nativeElement) {
this.streamVideo.nativeElement.srcObject = this.localMediaStream;
} else {
// Fallback for old browsers.
// See https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/srcObject#Examples
this.streamVideo.nativeElement.src = window.URL.createObjectURL(this.localMediaStream); this.streamVideo.nativeElement.src = window.URL.createObjectURL(this.localMediaStream);
}
// If stream isn't ready in a while, show error. // If stream isn't ready in a while, show error.
waitTimeout = setTimeout(() => { waitTimeout = setTimeout(() => {