Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Toolkit
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
digital blueprint
Web Component Framework
Toolkit
Commits
55771232
Commit
55771232
authored
4 years ago
by
Steinwender, Tamara
Browse files
Options
Downloads
Patches
Plain Diff
Adding the video tag to dom QR code scanner
parent
9c6e4e92
No related branches found
No related tags found
No related merge requests found
Pipeline
#13918
passed
4 years ago
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
packages/qr-code-scanner/src/qr-code-scanner.js
+4
-6
4 additions, 6 deletions
packages/qr-code-scanner/src/qr-code-scanner.js
with
4 additions
and
6 deletions
packages/qr-code-scanner/src/qr-code-scanner.js
+
4
−
6
View file @
55771232
...
@@ -143,8 +143,6 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
...
@@ -143,8 +143,6 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
this
.
_outputData
=
null
;
this
.
_outputData
=
null
;
this
.
_videoRunning
=
false
;
this
.
_videoRunning
=
false
;
this
.
_lock
=
new
Mutex
();
this
.
_lock
=
new
Mutex
();
this
.
videoReady
=
false
;
}
}
static
get
scopedElements
()
{
static
get
scopedElements
()
{
...
@@ -227,12 +225,14 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
...
@@ -227,12 +225,14 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
await
this
.
updateComplete
;
await
this
.
updateComplete
;
let
targetCanvas
=
this
.
_
(
"
#canvas
"
);
let
targetCanvas
=
this
.
_
(
"
#canvas
"
);
let
targetvideo
=
this
.
_
(
"
#video
"
);
let
canvasElement
=
document
.
createElement
(
"
canvas
"
);
let
canvasElement
=
document
.
createElement
(
"
canvas
"
);
let
firstDrawDone
=
false
;
let
firstDrawDone
=
false
;
this
.
_askPermission
=
true
;
this
.
_askPermission
=
true
;
this
.
_loadingMessage
=
i18n
.
t
(
'
no-camera-access
'
);
this
.
_loadingMessage
=
i18n
.
t
(
'
no-camera-access
'
);
let
video
=
await
createVideoElement
(
this
.
_activeCamera
);
let
video
=
await
createVideoElement
(
this
.
_activeCamera
);
targetvideo
.
appendChild
(
video
);
this
.
_askPermission
=
false
;
this
.
_askPermission
=
false
;
let
lastCode
=
null
;
let
lastCode
=
null
;
...
@@ -242,11 +242,9 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
...
@@ -242,11 +242,9 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
let
detectorRunning
=
false
;
let
detectorRunning
=
false
;
const
tick
=
()
=>
{
const
tick
=
()
=>
{
console
.
log
(
"
---
"
,
this
.
videoReady
);
this
.
_requestID
=
null
;
this
.
_requestID
=
null
;
if
(
video
.
readyState
===
video
.
HAVE_ENOUGH_DATA
||
this
.
videoReady
)
{
if
(
video
.
readyState
===
video
.
HAVE_ENOUGH_DATA
)
{
this
.
_loading
=
false
;
this
.
_loading
=
false
;
this
.
videoReady
=
true
;
// draw into a temporary canvas first
// draw into a temporary canvas first
canvasElement
.
height
=
video
.
videoHeight
;
canvasElement
.
height
=
video
.
videoHeight
;
canvasElement
.
width
=
video
.
videoWidth
;
canvasElement
.
width
=
video
.
videoWidth
;
...
@@ -385,7 +383,6 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
...
@@ -385,7 +383,6 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
this
.
_askPermission
=
false
;
this
.
_askPermission
=
false
;
this
.
_videoRunning
=
false
;
this
.
_videoRunning
=
false
;
this
.
_loading
=
false
;
this
.
_loading
=
false
;
this
.
videoReady
=
false
;
this
.
_loadingMessage
=
''
;
this
.
_loadingMessage
=
''
;
}
finally
{
}
finally
{
...
@@ -501,6 +498,7 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
...
@@ -501,6 +498,7 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
</div>
</div>
</div>
</div>
<canvas id="canvas" class="
${
classMap
({
hidden
:
!
showCanvas
})}
"></canvas>
<canvas id="canvas" class="
${
classMap
({
hidden
:
!
showCanvas
})}
"></canvas>
<div id="video"></div>
<div class="output
${
classMap
({
hidden
:
!
(
this
.
showOutput
&&
showCanvas
)})}
">
<div class="output
${
classMap
({
hidden
:
!
(
this
.
showOutput
&&
showCanvas
)})}
">
${
(
this
.
_outputData
!==
null
)
?
html
`
${
(
this
.
_outputData
!==
null
)
?
html
`
<div><b>
${
i18n
.
t
(
'
data
'
)}
:</b> <span>
${
this
.
_outputData
}
</span></div>
<div><b>
${
i18n
.
t
(
'
data
'
)}
:</b> <span>
${
this
.
_outputData
}
</span></div>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment