Skip to content

block UI #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cc-cpo wants to merge 5 commits into
base: master
Choose a base branch
from
Open

block UI #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a5a4db
add unconfigured blockUI
cc-cpo May 19, 2017
8a4a8c7
click to abort
cc-cpo May 19, 2017
014cc6d
fix blockUI z-index
cc-cpo May 19, 2017
b35ab3f
style blockUI
cc-cpo May 19, 2017
69524e6
declare block-on-submit behaviour via marker class
cc-cpo May 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ dependencies {
compile('com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.8')
compile('org.webjars:bootstrap:3.3.7-1')
compile('org.webjars:jquery:3.2.0')
compile('org.webjars:jquery-blockui:2.65')
compile('org.webjars:clipboard.js:1.6.1')
compile('org.webjars.bower:pwstrength-bootstrap:2.0.3')
compile('org.webjars.bower:bootstrap-maxlength:1.7.0')
Expand Down
20 changes: 20 additions & 0 deletions src/main/resources/static/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,24 @@ $(function () {
setTooltip(e.trigger, 'Failed!');
hideTooltip(e.trigger);
});

// must be greater than z-index of maxlength indicator
$.blockUI.defaults.baseZ = 2000;
$.blockUI.defaults.css.border = '6px double #669966';

$('form.submit--blocking').submit(function(event) {
var abortSend = function() {
$.unblockUI();
history.go(0); // reset page
};
var block = function() {
$.blockUI({
message: 'Please wait .. click to ABORT',
overlayCSS: { backgroundColor: '#99CC00' },
onOverlayClick: abortSend
});
};
setTimeout(block, 700);
});

});
1 change: 1 addition & 0 deletions src/main/resources/templates/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<link rel="stylesheet" type="text/css" th:href="@{/webjars/bootstrap/3.3.7-1/css/bootstrap.min.css}"/>
<link rel="stylesheet" type="text/css" th:href="@{/css/app.css}"/>
<script th:src="@{/webjars/jquery/3.2.0/jquery.min.js}"></script>
<script th:src="@{/webjars/jquery-blockui/2.65/jquery.blockUI.js}"></script>
<script th:src="@{/webjars/bootstrap/3.3.7-1/js/bootstrap.min.js}"></script>
<script th:src="@{/webjars/clipboard.js/1.6.1/clipboard.min.js}"></script>
<script th:src="@{/js/app.js}"></script>
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/templates/send/send_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ <h1>Secure Transfer</h1>

<p>Securely send your sensitive data.</p>

<form th:action="@{/send}" method="post" th:object="${command}" enctype="multipart/form-data" autocomplete="off">
<form th:action="@{/send}" method="post" class="submit--blocking"
th:object="${command}" enctype="multipart/form-data" autocomplete="off">

<div class="panel panel-danger" th:if="${#fields.hasAnyErrors()}">
<div class="panel-heading">Error processing your request</div>
Expand Down