Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
138
Merge Requests
138
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
5872da1d
Commit
5872da1d
authored
Feb 17, 2020
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_document_scanner: Avoid to disable all buttons if current button is already disabled
parent
30161fc5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.js
...ateItem/web_page_module/rjs_gadget_document_scanner_js.js
+8
-4
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.xml
...teItem/web_page_module/rjs_gadget_document_scanner_js.xml
+2
-2
No files found.
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.js
View file @
5872da1d
...
...
@@ -534,7 +534,7 @@
})
.
onEvent
(
"
click
"
,
function
(
evt
)
{
// Only handle click on BUTTON element
// Only handle click on BUTTON
and IMG
element
if
(
evt
.
target
.
tagName
!==
'
BUTTON
'
&&
evt
.
target
.
tagName
!==
'
IMG
'
)
{
return
;
}
...
...
@@ -544,9 +544,13 @@
// Disable any button. It must be managed by this gadget
evt
.
preventDefault
();
gadget
.
element
.
querySelectorAll
(
'
button
'
).
forEach
(
function
(
elt
)
{
elt
.
disabled
=
true
;
});
// If user clicks on same image twice,
// we don't need to disable everything again if parent is already disabled
if
(
evt
.
target
.
tagName
===
'
IMG
'
&&
!
evt
.
target
.
parentElement
.
disabled
)
{
gadget
.
element
.
querySelectorAll
(
'
button
'
).
forEach
(
function
(
elt
)
{
elt
.
disabled
=
true
;
});
}
if
(
evt
.
target
.
className
.
indexOf
(
"
take-picture-btn
"
)
!==
-
1
)
{
return
gadget
.
changeState
({
...
...
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/rjs_gadget_document_scanner_js.xml
View file @
5872da1d
...
...
@@ -244,7 +244,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
981.5
8568.65411.58828
</string>
</value>
<value>
<string>
981.5
9234.29833.17954
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>
15819
03960.55
</float>
<float>
15819
44351.11
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment