Commit 8236d6ac authored by Romain Courteaud's avatar Romain Courteaud

erp5_document_scanner: always display the autocrop button

parent 5de623f2
...@@ -191,9 +191,10 @@ ...@@ -191,9 +191,10 @@
guides: true, guides: true,
center: true, center: true,
background: false, background: false,
minContainerWidth: 0, minContainerWidth: 1,
minContainerHeight: 0, minContainerHeight: 1,
responsive: true, responsive: true,
restore: true,
// Avoid any cropper calculation or guessing // Avoid any cropper calculation or guessing
scalable: false, scalable: false,
rotatable: false, rotatable: false,
...@@ -429,14 +430,11 @@ ...@@ -429,14 +430,11 @@
text: result_list[1][0] text: result_list[1][0]
})); }));
if (gadget.state.is_cropper_size_confirmed) { button_list.push(
button_list.push( domsugar('button', {type: 'button',
domsugar('button', {type: 'button', 'class': 'auto-crop-btn ui-icon-fast-forward ui-btn-icon-left',
'class': 'auto-crop-btn ui-icon-fast-forward ui-btn-icon-left', text: result_list[1][3]
text: result_list[1][3] }));
})
);
}
div = domsugar('div', {'class': 'camera'}, [ div = domsugar('div', {'class': 'camera'}, [
domsugar('div', {'class': 'camera-header'}, [ domsugar('div', {'class': 'camera-header'}, [
...@@ -722,7 +720,9 @@ ...@@ -722,7 +720,9 @@
domsugar('label', {'class': 'page-number', text: gadget.state.page + 1}) domsugar('label', {'class': 'page-number', text: gadget.state.page + 1})
]) ])
]), ]),
domsugar('img', {src: gadget.state['blob_url_' + gadget.state.page]}), domsugar('div', {'class': 'img-container'}, [
domsugar('img', {src: gadget.state['blob_url_' + gadget.state.page]})
]),
// XXX TODO: why is the button rendering different from the other pages? // XXX TODO: why is the button rendering different from the other pages?
domsugar('div', {'class': 'edit-picture'}, button_list), domsugar('div', {'class': 'edit-picture'}, button_list),
result_list[1] result_list[1]
...@@ -742,8 +742,7 @@ ...@@ -742,8 +742,7 @@
preferred_cropped_canvas_data: gadget.cropper.getData(), preferred_cropped_canvas_data: gadget.cropper.getData(),
display_step: 'display_video', display_step: 'display_video',
page: gadget.state.page + 1, page: gadget.state.page + 1,
page_count: gadget.state.page_count + 1, page_count: gadget.state.page_count + 1
is_cropper_size_confirmed: true
}; };
// Keep image date, as user may need to display it again // Keep image date, as user may need to display it again
state_dict['blob_canvas_' + gadget.state.page_count] = canvas; state_dict['blob_canvas_' + gadget.state.page_count] = canvas;
...@@ -789,8 +788,7 @@ ...@@ -789,8 +788,7 @@
display_step: 'display_video', display_step: 'display_video',
page: 1, page: 1,
page_count: 0, page_count: 0,
camera_list: [], camera_list: []
is_cropper_size_confirmed: false
}) })
.declareMethod('render', function (options) { .declareMethod('render', function (options) {
// This method is called during the ERP5 form rendering // This method is called during the ERP5 form rendering
......
...@@ -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.61167.48996.42035</string> </value> <value> <string>982.61614.28913.46660</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>1585821355.34</float> <float>1585846471.58</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment