Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
nopaque
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
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
Show more breadcrumbs
SFB 1288 - INF
nopaque
Commits
07c4e315
Commit
07c4e315
authored
5 years ago
by
Patrick Jentsch
Browse files
Options
Downloads
Patches
Plain Diff
Use modals instead of toasts for progress indication.
parent
70c97d44
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/static/js/opaque.js
+24
-22
24 additions, 22 deletions
app/static/js/opaque.js
app/templates/services/nlp.html.j2
+16
-1
16 additions, 1 deletion
app/templates/services/nlp.html.j2
app/templates/services/ocr.html.j2
+16
-1
16 additions, 1 deletion
app/templates/services/ocr.html.j2
with
56 additions
and
24 deletions
app/static/js/opaque.js
+
24
−
22
View file @
07c4e315
function
sendNewJobFormData
(
form
,
progress
)
{
function
sendNewJobFormData
(
newJobFormElement
,
progressModalElement
)
{
var
XHR
=
new
XMLHttpRequest
();
var
formData
;
var
FD
=
new
FormData
(
form
);
var
progress
;
XHR
.
upload
.
addEventListener
(
"
progress
"
,
function
(
event
)
{
var
progressModal
;
progress
.
querySelector
(
"
.determinate
"
).
style
.
width
=
((
event
.
loaded
/
event
.
total
)
*
100
).
toString
()
+
"
%
"
;
var
request
;
formData
=
new
FormData
(
newJobFormElement
);
progressModal
=
M
.
Modal
.
getInstance
(
progressModalElement
);
request
=
new
XMLHttpRequest
();
progressModal
.
options
.
dismissible
=
false
;
progressModalElement
.
querySelector
(
"
.title
"
).
innerHTML
=
newJobFormElement
.
title
.
value
;
request
.
upload
.
addEventListener
(
"
progress
"
,
function
(
event
)
{
progressModalElement
.
querySelector
(
"
.loaded
"
).
innerHTML
=
event
.
loaded
.
toString
();
progressModalElement
.
querySelector
(
"
.total
"
).
innerHTML
=
event
.
total
.
toString
();
progressModalElement
.
querySelector
(
"
.determinate
"
).
style
.
width
=
((
event
.
loaded
/
event
.
total
)
*
100
).
toString
()
+
"
%
"
;
});
});
XHR
.
addEventListener
(
"
loadend
"
,
function
(
event
)
{
request
.
addEventListener
(
"
loadend
"
,
function
(
event
)
{
form
.
reset
();
newJobFormElement
.
reset
();
location
.
reload
();
location
.
reload
();
});
});
XHR
.
open
(
"
POST
"
,
window
.
location
.
href
);
XHR
.
send
(
FD
);
progressModal
.
open
();
request
.
open
(
"
POST
"
,
window
.
location
.
href
);
request
.
send
(
formData
);
}
}
function
initNewJobForm
(
newJobFormElement
)
{
function
initNewJobForm
(
newJobFormElement
,
progressModalElement
)
{
newJobFormElement
.
addEventListener
(
"
submit
"
,
function
(
event
)
{
newJobFormElement
.
addEventListener
(
"
submit
"
,
function
(
event
)
{
event
.
preventDefault
();
event
.
preventDefault
();
var
toast
=
M
.
toast
(
sendNewJobFormData
(
newJobFormElement
,
progressModalElement
);
{
html
:
`<div class="row">
<div class="col s12">
${
this
.
title
.
value
}
</div>
<div class="col s12">
<div class="progress">
<div class="determinate" style="width: 0%"></div>
</div>
</div>
</div>`
,
displayLength
:
Infinity
}
);
sendNewJobFormData
(
this
,
toast
.
el
.
querySelector
(
"
.progress
"
));
});
});
}
}
This diff is collapsed.
Click to expand it.
app/templates/services/nlp.html.j2
+
16
−
1
View file @
07c4e315
...
@@ -121,7 +121,22 @@
...
@@ -121,7 +121,22 @@
</form>
</form>
</div>
</div>
</div>
</div>
<div id="progress-modal" class="modal">
<div class="modal-content">
<h4 class="title"></h4>
<p>Uploading files... <span class="loaded"></span>/<span class="total"></span></p>
<div class="progress">
<div class="determinate" style="width: 0%"></div>
</div>
</div>
<div class="modal-footer">
<a href="#!" class="modal-close waves-effect waves-green btn-flat disabled">Cancel</a>
</div>
</div>
<script>
<script>
initNewJobForm(document.getElementById("new-nlp-job-form"));
initNewJobForm(document.getElementById("new-nlp-job-form"),
document.getElementById("progress-modal"));
</script>
</script>
{% endblock %}
{% endblock %}
This diff is collapsed.
Click to expand it.
app/templates/services/ocr.html.j2
+
16
−
1
View file @
07c4e315
...
@@ -138,7 +138,22 @@
...
@@ -138,7 +138,22 @@
</form>
</form>
</div>
</div>
</div>
</div>
<div id="progress-modal" class="modal">
<div class="modal-content">
<h4 class="title"></h4>
<p>Uploading files... <span class="loaded"></span>/<span class="total"></span></p>
<div class="progress">
<div class="determinate" style="width: 0%"></div>
</div>
</div>
<div class="modal-footer">
<a href="#!" class="modal-close waves-effect waves-green btn-flat disabled">Cancel</a>
</div>
</div>
<script>
<script>
initNewJobForm(document.getElementById("new-ocr-job-form"));
initNewJobForm(document.getElementById("new-ocr-job-form"),
document.getElementById("progress-modal"));
</script>
</script>
{% endblock %}
{% endblock %}
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