This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
The following commit(s) were added to refs/heads/master by this push:
new 4ae926045 [#8504] more inline event replacement
4ae926045 is described below
commit 4ae9260455df2bfe17cc0ceafc8113c68c88ca1b
Author: Guillermo Cruz <[email protected]>
AuthorDate: Mon Apr 24 14:14:32 2023 -0500
[#8504] more inline event replacement
---
Allura/allura/lib/widgets/forms.py | 8 +++++---
ForgeFiles/forgefiles/nf/files/js/create_folder.js | 3 ++-
ForgeFiles/forgefiles/nf/files/js/delete.js | 3 ++-
ForgeFiles/forgefiles/nf/files/js/edit.js | 3 ++-
ForgeFiles/forgefiles/nf/files/js/publish_folder.js | 3 ++-
ForgeFiles/forgefiles/nf/files/js/upload_files.js | 3 ++-
ForgeFiles/forgefiles/templates/create_folder.html | 6 ++++--
ForgeFiles/forgefiles/templates/delete.html | 5 ++++-
ForgeFiles/forgefiles/templates/edit.html | 5 ++++-
ForgeFiles/forgefiles/templates/publish_folder.html | 5 ++++-
ForgeFiles/forgefiles/templates/upload_file.html | 5 ++++-
11 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/Allura/allura/lib/widgets/forms.py
b/Allura/allura/lib/widgets/forms.py
index 94b99871a..0ac373b2d 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -261,7 +261,7 @@ class PersonalDataForm(ForgeForm):
[ew.Option(py_value=c, label=n, selected=False)
for c, n in sorted(list(country_names.items()),
key=lambda k_v: k_v[1])],
- attrs={'onchange': 'selectTimezone(this.value)'}),
+ ),
ew.TextField(
name='city',
label='City of residence',
@@ -334,7 +334,7 @@ class PersonalDataForm(ForgeForm):
yield ew.JSScript('''
var $allTimezones = $("#tz").clone();
var $t = ''' + h.escape_json(dict(country_timezones)) + ''';
-function selectTimezone($country){
+function selectTimeZ($country){
if($country == " "){
$("#tz").replaceWith($allTimezones);
}
@@ -344,7 +344,9 @@ function selectTimezone($country){
$("#tz").append($("<option></option>").attr("value",
value).text(value))
})
}
-}''')
+};
+$("select[name='country']").on("change", function(e){
selectTimeZ(e.target.value) });
+''')
class AddTelNumberForm(ForgeForm):
diff --git a/ForgeFiles/forgefiles/nf/files/js/create_folder.js
b/ForgeFiles/forgefiles/nf/files/js/create_folder.js
index ec9a8e3e1..64c9e54f3 100644
--- a/ForgeFiles/forgefiles/nf/files/js/create_folder.js
+++ b/ForgeFiles/forgefiles/nf/files/js/create_folder.js
@@ -20,7 +20,7 @@
$('#admin_modal_title').hide();
$('#folder_id').focus();
-function validateFolderForm(){
+function validateFolderForm(e){
var folder_id = document.getElementById('folder_id');
var folder_name = $(folder_id).val().trim();
var error = $('#error_message');
@@ -29,6 +29,7 @@ function validateFolderForm(){
flag = validateName(folder_name);
if ( folder_name.length === 0){
+ e.preventDefault();
$(error).text('Please enter folder name.');
return false;
}
diff --git a/ForgeFiles/forgefiles/nf/files/js/delete.js
b/ForgeFiles/forgefiles/nf/files/js/delete.js
index 20e215088..d874b04e4 100644
--- a/ForgeFiles/forgefiles/nf/files/js/delete.js
+++ b/ForgeFiles/forgefiles/nf/files/js/delete.js
@@ -19,13 +19,14 @@
$('#admin_modal_title').hide();
-function ConfirmDeleteFolder() {
+function ConfirmDeleteFolder(e) {
var obj_id = document.getElementById('delete_id');
var confirm_delete = $(obj_id).val();
var error = $('#error_message');
if (confirm_delete === "DELETE") {
return true;
} else {
+ e.preventDefault();
$(error).text('You must confirm with the word DELETE');
return false;
}
diff --git a/ForgeFiles/forgefiles/nf/files/js/edit.js
b/ForgeFiles/forgefiles/nf/files/js/edit.js
index 52d64cd82..8e6bea1b6 100644
--- a/ForgeFiles/forgefiles/nf/files/js/edit.js
+++ b/ForgeFiles/forgefiles/nf/files/js/edit.js
@@ -21,13 +21,14 @@ $('#admin_modal_title').hide();
$('#obj_id').select();
var obj_type = $('#obj_type').val();
-function validateEditFolderForm(){
+function validateEditFolderForm(e){
var folder_obj = document.getElementById('obj_id');
var folder_name = $(folder_obj).val().trim();
var error = $('#error_message');
var flag;
flag = validateName(folder_name);
if (folder_name.length === 0){
+ e.preventDefault();
if(obj_type == 'folder')
$(error).text('Please enter folder name');
else if(obj_type == 'file')
diff --git a/ForgeFiles/forgefiles/nf/files/js/publish_folder.js
b/ForgeFiles/forgefiles/nf/files/js/publish_folder.js
index a69ed7896..f9c0acac1 100644
--- a/ForgeFiles/forgefiles/nf/files/js/publish_folder.js
+++ b/ForgeFiles/forgefiles/nf/files/js/publish_folder.js
@@ -21,7 +21,7 @@ $('#admin_modal_title').hide();
$('#remarks_id').focus();
- function ConfirmPublishFolder(){
+ function ConfirmPublishFolder(e){
var remarks = document.getElementById('remarks_id');
var release_notes = $(remarks).val().trim();
var error = $('#error_message');
@@ -31,6 +31,7 @@ $('#remarks_id').focus();
var publish_status = $(current_folder).val();
var submit_btn = $('#submit_btn');
if(release_notes.length === 0){
+ e.preventDefault();
$(error).text('Please enter release notes');
return false;
}
diff --git a/ForgeFiles/forgefiles/nf/files/js/upload_files.js
b/ForgeFiles/forgefiles/nf/files/js/upload_files.js
index 268f0160c..2b7c45940 100644
--- a/ForgeFiles/forgefiles/nf/files/js/upload_files.js
+++ b/ForgeFiles/forgefiles/nf/files/js/upload_files.js
@@ -19,13 +19,14 @@
$('#admin_modal_title').hide();
-function validateFileForm() {
+function validateFileForm(e) {
var file_input = document.getElementById('file_input');
var file_path = file_input.value.split('\\').pop();
var filename = $('#filename');
var file_val = $(file_input).val();
var error = $('#error_message');
if (file_val.length === 0) {
+ e.preventDefault();
$(error).text('Please upload a file');
return false;
} else {
diff --git a/ForgeFiles/forgefiles/templates/create_folder.html
b/ForgeFiles/forgefiles/templates/create_folder.html
index fef917eab..8cc7c99d5 100644
--- a/ForgeFiles/forgefiles/templates/create_folder.html
+++ b/ForgeFiles/forgefiles/templates/create_folder.html
@@ -26,7 +26,7 @@
</h1>
<div id="folder_popup" class="" role="dialog" >
- <form {% if folder_object %}
action="{{folder_object.url()}}/create_folder" {% else %}
action="{{c.app.url}}create_folder" {% endif %} method="post"
enctype="multipart/form-data" onsubmit="return validateFolderForm();">
+ <form {% if folder_object %}
action="{{folder_object.url()}}/create_folder" {% else %}
action="{{c.app.url}}create_folder" {% endif %} method="post"
id="create-folder-form" enctype="multipart/form-data">
<div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content">
@@ -54,5 +54,7 @@
{{lib.csrf_token()}}
</form>
</div>
-
+<script>
+ $('#create-folder-form').on('submit', function(e){ validateFolderForm(e)
});
+</script>
diff --git a/ForgeFiles/forgefiles/templates/delete.html
b/ForgeFiles/forgefiles/templates/delete.html
index 229450d66..ae1f69ca6 100644
--- a/ForgeFiles/forgefiles/templates/delete.html
+++ b/ForgeFiles/forgefiles/templates/delete.html
@@ -26,7 +26,7 @@
</h1>
<div id="delete_folder_popup" >
-<form id ='delete_folder_form' method="post" {% if folder_object %}
action="{{c.app.url}}delete_folder" {% elif file_object %}
action="{{c.app.url}}delete_file" {% endif %} onsubmit="return
ConfirmDeleteFolder();" >
+<form id ='delete_folder_form' method="post" {% if folder_object %}
action="{{c.app.url}}delete_folder" {% elif file_object %}
action="{{c.app.url}}delete_file" {% endif %}>
<div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content">
@@ -58,5 +58,8 @@
{{lib.csrf_token()}}
</form>
</div>
+<script>
+ $('#delete_folder_form').on('submit', function(e){ ConfirmDeleteFolder(e)
});
+</script>
diff --git a/ForgeFiles/forgefiles/templates/edit.html
b/ForgeFiles/forgefiles/templates/edit.html
index 737987258..8323892b5 100644
--- a/ForgeFiles/forgefiles/templates/edit.html
+++ b/ForgeFiles/forgefiles/templates/edit.html
@@ -33,7 +33,7 @@
{% elif file_object %}
action="{{c.app.url}}edit_file"
{% endif %}
- onsubmit="return validateEditFolderForm();" >
+ >
<div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content">
@@ -74,5 +74,8 @@
{{lib.csrf_token()}}
</form>
</div>
+<script>
+ $('#edit_folder_form').on('submit', function(e){ validateEditFolderForm(e)
});
+</script>
diff --git a/ForgeFiles/forgefiles/templates/publish_folder.html
b/ForgeFiles/forgefiles/templates/publish_folder.html
index c4bd240c1..b53c6a2ff 100644
--- a/ForgeFiles/forgefiles/templates/publish_folder.html
+++ b/ForgeFiles/forgefiles/templates/publish_folder.html
@@ -27,7 +27,7 @@
<!-- popup for publish folder-->
<div id="publish_folder_popup" >
-<form id ='publish_folder_form' method="post"
action="{{c.app.url}}publish_folder" onsubmit="return ConfirmPublishFolder();" >
+<form id ='publish_folder_form' method="post"
action="{{c.app.url}}publish_folder">
<div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content">
@@ -64,6 +64,9 @@
<script type="text/javascript"
src="{{g.app_static('js/publish_folder.js')}}"></script>
+<script>
+ $('#publish_folder_form').on('submit', function(e){
ConfirmPublishFolder(e) });
+</script>
diff --git a/ForgeFiles/forgefiles/templates/upload_file.html
b/ForgeFiles/forgefiles/templates/upload_file.html
index 1dd109d39..cb8665ef9 100644
--- a/ForgeFiles/forgefiles/templates/upload_file.html
+++ b/ForgeFiles/forgefiles/templates/upload_file.html
@@ -27,7 +27,7 @@
<!-- popup for add files-->
<div id="file_popup" >
- <form {% if folder_object %} action="{{folder_object.url()}}/upload_file"
{% else %} action="{{c.app.url}}upload_file" {% endif %} method="post"
enctype="multipart/form-data" onsubmit="return validateFileForm()" >
+ <form {% if folder_object %} action="{{folder_object.url()}}/upload_file"
{% else %} action="{{c.app.url}}upload_file" {% endif %} method="post"
enctype="multipart/form-data" id="upload-file-form">
<div class="modal-dialog">
<!-- Modal content-->
<div class="modal-content">
@@ -53,3 +53,6 @@
{{lib.csrf_token()}}
</form>
</div>
+<script>
+ $('#upload-file-form').on('submit', function(e){ validateFileForm(e) });
+</script>
