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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
73d63a91
Commit
73d63a91
authored
Apr 02, 2020
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_document_scanner: unify video and cropper rendering
parent
de271f73
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
12 deletions
+17
-12
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_css.css
...m/web_page_module/scanner_gadget_document_scanner_css.css
+1
-1
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_css.xml
...m/web_page_module/scanner_gadget_document_scanner_css.xml
+2
-2
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_js.js
...tem/web_page_module/scanner_gadget_document_scanner_js.js
+10
-6
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_js.xml
...em/web_page_module/scanner_gadget_document_scanner_js.xml
+2
-2
bt5/erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/documentscannercss.less.txt
...l_skins/erp5_document_scanner/documentscannercss.less.txt
+2
-1
No files found.
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_css.css
View file @
73d63a91
...
@@ -20,7 +20,7 @@ div[data-gadget-url$="gadget_document_scanner.html"] .canvas {
...
@@ -20,7 +20,7 @@ div[data-gadget-url$="gadget_document_scanner.html"] .canvas {
text-align
:
center
;
text-align
:
center
;
}
}
div
[
data-gadget-url
$
=
"gadget_document_scanner.html"
]
.camera-input
{
div
[
data-gadget-url
$
=
"gadget_document_scanner.html"
]
.camera-input
{
min-height
:
360px
;
background-color
:
rgba
(
0
,
0
,
0
,
0.5
)
;
}
}
div
[
data-gadget-url
$
=
"gadget_document_scanner.html"
]
.page-number
{
div
[
data-gadget-url
$
=
"gadget_document_scanner.html"
]
.page-number
{
display
:
inline
;
display
:
inline
;
...
...
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_css.xml
View file @
73d63a91
...
@@ -244,7 +244,7 @@
...
@@ -244,7 +244,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
982.60
019.31334.2372
</string>
</value>
<value>
<string>
982.60
162.8290.29303
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -262,7 +262,7 @@
...
@@ -262,7 +262,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1585
753245.1
8
</float>
<float>
1585
815950.
8
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_js.js
View file @
73d63a91
...
@@ -186,14 +186,18 @@
...
@@ -186,14 +186,18 @@
// creating Cropper is asynchronous
// creating Cropper is asynchronous
return
new
RSVP
.
Promise
(
function
(
resolve
,
reject
)
{
return
new
RSVP
.
Promise
(
function
(
resolve
,
reject
)
{
cropper
=
new
Cropper
(
element
,
{
cropper
=
new
Cropper
(
element
,
{
// restrict the minimum canvas size to fill fit the container
// restrict the minimum canvas size to fit within the container
viewMode
:
3
,
viewMode
:
2
,
guides
:
true
,
center
:
true
,
background
:
false
,
minContainerWidth
:
0
,
minContainerHeight
:
0
,
responsive
:
false
,
// Avoid any cropper calculation or guessing
// Avoid any cropper calculation or guessing
scalable
:
false
,
scalable
:
false
,
// Please, DON'T touch on rotatable and checkOrientation. Removing it,
rotatable
:
false
,
// we will not be able to fix orientation before crop.
checkOrientation
:
false
,
rotatable
:
true
,
checkOrientation
:
true
,
zoomable
:
false
,
zoomable
:
false
,
movable
:
false
,
movable
:
false
,
data
:
data
,
data
:
data
,
...
...
bt5/erp5_document_scanner/PathTemplateItem/web_page_module/scanner_gadget_document_scanner_js.xml
View file @
73d63a91
...
@@ -244,7 +244,7 @@
...
@@ -244,7 +244,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
982.
59651.45192.29798
</string>
</value>
<value>
<string>
982.
61109.60561.44919
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -262,7 +262,7 @@
...
@@ -262,7 +262,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1585
728228.
5
</float>
<float>
1585
815745.9
5
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_document_scanner/SkinTemplateItem/portal_skins/erp5_document_scanner/documentscannercss.less.txt
View file @
73d63a91
...
@@ -19,7 +19,8 @@ div[data-gadget-url$="gadget_document_scanner.html"] {
...
@@ -19,7 +19,8 @@ div[data-gadget-url$="gadget_document_scanner.html"] {
}
}
.camera-input {
.camera-input {
min-height: 360px;
// Mimic cropper background
background-color: rgba(0, 0, 0, 0.5);
}
}
.page-number {
.page-number {
...
...
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