From 053fec259e773c73f2c5c1270a7285656a0bc89b Mon Sep 17 00:00:00 2001 From: Greg Huber Date: Wed, 11 Nov 2026 08:32:59 +0000 Subject: [PATCH 1/3] Move validate email address to page rather than in global roller.js --- .../webapp/WEB-INF/jsps/core/CreateWeblog.jsp | 21 ++++++++++++++++ app/src/main/webapp/theme/scripts/roller.js | 24 +------------------ 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp index b574975fc5..af9ba4a74c 100644 --- a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp @@ -89,6 +89,27 @@ var saveButton; $( document ).ready(function() { + + jQuery("form.validate-form").validate(); + // Added method to check valid email address and add a custom error message + jQuery.validator.addMethod( + "regex", + function(value, element, regexp) { + if (regexp && regexp.constructor != RegExp) { + regexp = new RegExp(regexp); + } else if (regexp.global) { + regexp.lastIndex = 0; + } + return this.optional(element) || regexp.test(value); + } + ); + // Applied email rules to field with class name validate-email + jQuery( ".validate-email" ).rules( "add", { + minlength: 3, + maxlength: 255, + email: true, + regex: /^\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}\b$/i + }); saveButton = $("#createWeblog_0"); diff --git a/app/src/main/webapp/theme/scripts/roller.js b/app/src/main/webapp/theme/scripts/roller.js index 357fb5b8c8..1747ef36af 100644 --- a/app/src/main/webapp/theme/scripts/roller.js +++ b/app/src/main/webapp/theme/scripts/roller.js @@ -236,26 +236,4 @@ function actionErrors(html) { return Array.prototype.map.call(errors, function (error) { return error.textContent.trim(); }); -} -$(document).ready(function () { - jQuery("form.validate-form").validate(); - // Added method to check valid email address and add a custom error message - jQuery.validator.addMethod( - "regex", - function(value, element, regexp) { - if (regexp && regexp.constructor != RegExp) { - regexp = new RegExp(regexp); - } else if (regexp.global) { - regexp.lastIndex = 0; - } - return this.optional(element) || regexp.test(value); - } - ); - // Applied email rules to field with class name validate-email - jQuery( ".validate-email" ).rules( "add", { - minlength: 3, - maxlength: 255, - email: true, - regex: /^\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}\b$/i - }); -}); +} \ No newline at end of file From 6b29dbb51621c2cbb85f603a0e8f4e5c167a055f Mon Sep 17 00:00:00 2001 From: Greg Huber Date: Sun, 15 Nov 2026 09:42:26 +0000 Subject: [PATCH 2/3] Fix spacing and remove tabs --- app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp | 4 ++-- app/src/main/webapp/theme/scripts/roller.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp index af9ba4a74c..2421603f62 100644 --- a/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/core/CreateWeblog.jsp @@ -89,8 +89,8 @@ var saveButton; $( document ).ready(function() { - - jQuery("form.validate-form").validate(); + + jQuery("form.validate-form").validate(); // Added method to check valid email address and add a custom error message jQuery.validator.addMethod( "regex", diff --git a/app/src/main/webapp/theme/scripts/roller.js b/app/src/main/webapp/theme/scripts/roller.js index 1747ef36af..af640acfaf 100644 --- a/app/src/main/webapp/theme/scripts/roller.js +++ b/app/src/main/webapp/theme/scripts/roller.js @@ -236,4 +236,4 @@ function actionErrors(html) { return Array.prototype.map.call(errors, function (error) { return error.textContent.trim(); }); -} \ No newline at end of file +} From 97a8a1429f9ac49c7b0537ff99e5d43e73869558 Mon Sep 17 00:00:00 2001 From: Greg Huber Date: Sun, 15 Nov 2026 10:06:49 +0000 Subject: [PATCH 3/3] Add change note. --- CHANGES.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index ae054e20d7..3e6038a422 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,11 @@ # Apache Roller — Changes +### Bug fixes + +- **Remove Move jQuery validate email address from roller.js and add to page** + Validation should be done on the pages that need ie have an email field, rather than in the global + roller.js. Stops js errors on pages with no jquery-validate js script. + ## 6.1.7 ### Improvements