Skip to content

Commit e8352c7

Browse files
committed
Fixed error in live_example; Working for iOS in Safari 11 beta
1 parent 74ed8c0 commit e8352c7

File tree

6 files changed

+20
-8
lines changed

6 files changed

+20
-8
lines changed

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
quaggaJS
22
========
33

4-
- [Changelog](#changelog) (2017-06-06)
4+
- [Changelog](#changelog) (2017-06-07)
55
- [Browser Support](#browser-support)
66
- [Installing](#installing)
77
- [Getting Started](#gettingstarted)
@@ -703,6 +703,13 @@ on the ``singleChannel`` flag in the configuration when using ``decodeSingle``.
703703

704704
## <a name="changelog">Changelog</a>
705705

706+
### 2017-06-07
707+
- Improvements
708+
- added `muted` and `playsinline` to `<video/>` to make it work for Safari 11
709+
Beta (even iOS)
710+
- Fixes
711+
- Fixed [example/live_w_locator.js](https://github.com/serratus/quaggaJS/blob/master/example/live_w_locator.js)
712+
706713
### 2017-06-06
707714
- Features
708715
- Support for Standard 2of5 barcodes (See

dist/quagga.js

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/quagga.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

example/live_w_locator.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ $(function() {
8181
}
8282
return;
8383
}
84-
node.parentNode.style.display = 'none';
8584
},
8685
initCameraSelection: function(){
8786
var streamLabel = Quagga.CameraAccess.getActiveStreamLabel();

lib/quagga.js

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/input/camera_access.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ function initCamera(video, constraints) {
4242
.then((stream) => {
4343
return new Promise((resolve) => {
4444
streamRef = stream;
45-
video.setAttribute("autoplay", 'true');
45+
video.setAttribute("autoplay", true);
46+
video.setAttribute('muted', true);
47+
video.setAttribute('playsinline', true);
4648
video.srcObject = stream;
4749
video.addEventListener('loadedmetadata', () => {
4850
video.play();

0 commit comments

Comments
 (0)