This is an automated email from the ASF dual-hosted git repository.
mridulpathak pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0fe43e6f11 Fixed: jQuery 4.0 migration broke legacy API usage in
common-theme (OFBIZ-13510)
0fe43e6f11 is described below
commit 0fe43e6f11c92d96b3634129a098f9c1ea7ebd06
Author: Mridul Pathak <[email protected]>
AuthorDate: Mon Aug 31 18:46:31 2026 +0530
Fixed: jQuery 4.0 migration broke legacy API usage in common-theme
(OFBIZ-13510)
Bumping jquery to 4.0.0 and jquery-migrate to 4.0.2 dropped legacy shims
that several call sites relied on, breaking the image frame dimension display,
My Portal's drag-and-drop reordering, and four .size() calls, and also hardens
about a dozen dynamic selectors against jQuery 4's stricter selector engine.
Verified live against a real OFBiz instance.
---
.../commonext/webapp/ordermgr-js/geoAutoCompleter.js | 3 +++
applications/humanres/template/category/CategoryTree.ftl | 2 +-
applications/product/template/category/CategoryTree.ftl | 2 +-
.../product/template/imagemanagement/ImageFrame.ftl | 2 +-
.../product/template/store/ProductStoreGroupTree.ftl | 2 +-
.../webapp/common-theme/js/plugins/myportal.js | 2 +-
.../common-theme/webapp/common-theme/js/util/OfbizUtil.js | 15 ++++++++++++---
.../webapp/common-theme/js/util/application.js | 4 ++--
.../webapp/common-theme/js/util/fieldlookup.js | 3 +++
.../webapp/common-theme/js/util/miscAjaxFunctions.js | 6 ++++++
.../common-theme/js/util/selectMultipleRelatedValues.js | 3 +++
themes/helveticus/webapp/helveticus/js/OfbizUtil.js | 3 +++
12 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
b/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
index 6a71594e47..2a3951db46 100644
--- a/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
+++ b/applications/commonext/webapp/ordermgr-js/geoAutoCompleter.js
@@ -79,6 +79,9 @@ function setKeyAsParameter(event, ui) {
//Generic function for fetching country's associated state list.
function getAssociatedStateList(countryId, stateId, errorId, divId) {
+ if (!countryId || !stateId) {
+ return;
+ }
var countryGeoId = jQuery("#" + countryId).val();
jQuery.ajax({
url: '/common-js/control/getAssociatedStateList',
diff --git a/applications/humanres/template/category/CategoryTree.ftl
b/applications/humanres/template/category/CategoryTree.ftl
index 864a384070..2a4f507da7 100644
--- a/applications/humanres/template/category/CategoryTree.ftl
+++ b/applications/humanres/template/category/CategoryTree.ftl
@@ -23,7 +23,7 @@ function unescapeHtmlText(text) {
return jQuery('<div />').html(text).text()
}
-jQuery(window).load(createTree());
+createTree();
<#-- creating the JSON Data -->
var rawdata = [
diff --git a/applications/product/template/category/CategoryTree.ftl
b/applications/product/template/category/CategoryTree.ftl
index 265c472641..098b4663f6 100644
--- a/applications/product/template/category/CategoryTree.ftl
+++ b/applications/product/template/category/CategoryTree.ftl
@@ -23,7 +23,7 @@ function unescapeHtmlText(text) {
return jQuery('<div />').html(text).text()
}
-jQuery(window).load(createTree());
+createTree();
<#-- creating the JSON Data -->
var rawdata = [
diff --git a/applications/product/template/imagemanagement/ImageFrame.ftl
b/applications/product/template/imagemanagement/ImageFrame.ftl
index cf7edb77b3..69ea32a45f 100644
--- a/applications/product/template/imagemanagement/ImageFrame.ftl
+++ b/applications/product/template/imagemanagement/ImageFrame.ftl
@@ -23,7 +23,7 @@ under the License.
var productId = jQuery('#ImageFrames_productId').val();
var imageName = jQuery('#ImageFrames_imageName').val();
});
- jQuery(window).load(function() {
+ jQuery(window).on('load', function() {
var width = jQuery('td.image-src img').width();
var height = jQuery('td.image-src img').height();
jQuery('td.image-src img').css("width", 200);
diff --git a/applications/product/template/store/ProductStoreGroupTree.ftl
b/applications/product/template/store/ProductStoreGroupTree.ftl
index 405256f437..44030cb38d 100644
--- a/applications/product/template/store/ProductStoreGroupTree.ftl
+++ b/applications/product/template/store/ProductStoreGroupTree.ftl
@@ -23,7 +23,7 @@ function unescapeHtmlText(text) {
return jQuery('<div />').html(text).text()
}
-jQuery(window).load(createTree());
+createTree();
<#-- creating the JSON Data -->
<#if parentProductStoreGroup?has_content>
diff --git a/themes/common-theme/webapp/common-theme/js/plugins/myportal.js
b/themes/common-theme/webapp/common-theme/js/plugins/myportal.js
index 3d428d0b94..4826af1feb 100644
--- a/themes/common-theme/webapp/common-theme/js/plugins/myportal.js
+++ b/themes/common-theme/webapp/common-theme/js/plugins/myportal.js
@@ -151,7 +151,7 @@ function updatePortletOrder(currentItem,
nextObjectToDroppedItem, mode, destinat
url: "/myportal/control/updatePortalPagePortletSeqAjax",
data: requestData,
type: "POST",
- }).success( function(data){ onCompleteRequest(); });
+ }).done( function(data){ onCompleteRequest(); });
}
diff --git a/themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js
b/themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js
index bdf99f1007..05a95733aa 100644
--- a/themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js
+++ b/themes/common-theme/webapp/common-theme/js/util/OfbizUtil.js
@@ -464,7 +464,7 @@ function initDateTimePicker(self) {
function addSelectAllObserver(action_checkbox) {
var form_fields = getFormFields(getForm(action_checkbox));
all_child =
form_fields.filter(":checkbox:not(:disabled):not(.selectAll)"),
- select_child = all_child.filter(".selectAllChild").size() > 0 ?
all_child.filter(".selectAllChild") : all_child,
+ select_child = all_child.filter(".selectAllChild").length > 0 ?
all_child.filter(".selectAllChild") : all_child,
parent_checkbox = form_fields.filter(".selectAll"),
is_parent = action_checkbox.is(".selectAll");
@@ -475,7 +475,7 @@ function addSelectAllObserver(action_checkbox) {
});
} else {
// Check/ Uncheck parent checkbox when child checkboxes checked.
- if (select_child.size() > 0) {
+ if (select_child.length > 0) {
var all_checked = true;
select_child.each(function () {
@@ -508,7 +508,7 @@ function getFormFields(element) {
function getForm(element) {
const formId = jQuery(element).attr('form');
// Get closest form if no form id specified else get the form using id.
- if (formId === undefined) {
+ if (!formId) {
return jQuery(element).closest('form');
} else {
return jQuery('#' + formId);
@@ -930,6 +930,9 @@ function ajaxAutoCompleter(areaCsvString, showDescription,
defaultMinLength, def
else
var url = initUrl + "?" + areaArray[i + 2];
var div = areaArray[i];
+ if (!div) {
+ continue;
+ }
// create a separated div where the result JSON Opbject will be placed
if ((jQuery("#" + div + "_auto")).length < 1) {
jQuery("<div id='" + div + "_auto'></div>").insertBefore("#" +
areaArray[i]);
@@ -1007,6 +1010,9 @@ function ajaxAutoCompleter(areaCsvString,
showDescription, defaultMinLength, def
}
function setLookDescription(textFieldId, description, params, formName,
showDescription) {
+ if (!textFieldId) {
+ return;
+ }
if (description) {
var start = description.lastIndexOf(' [');
if (start != -1) {
@@ -1218,6 +1224,9 @@ function toggleScreenlet(link, areaId, saveCollapsed,
expandTxt, collapseTxt) {
*/
function ajaxInPlaceEditDisplayField(element, url, options) {
+ if (!element) {
+ return;
+ }
var jElement = jQuery("#" + element);
jElement.mouseover(function () {
jQuery(this).css('background-color', 'rgb(255, 255, 153)');
diff --git a/themes/common-theme/webapp/common-theme/js/util/application.js
b/themes/common-theme/webapp/common-theme/js/util/application.js
index 927e752733..c3cfa6cf82 100644
--- a/themes/common-theme/webapp/common-theme/js/util/application.js
+++ b/themes/common-theme/webapp/common-theme/js/util/application.js
@@ -33,7 +33,7 @@ var j = 1;
this.each(function() {
var settings = jQuery.extend(defaults, options);
- var totalListElements = jQuery(this).children('li').size();
+ var totalListElements = jQuery(this).children('li').length;
var baseColItems = Math.ceil(totalListElements / settings.colNumber);
var listClass = jQuery(this).attr('class');
@@ -72,7 +72,7 @@ var j = 1;
});
jQuery('.listContainer'+j).find('ol,ul').each(function(){
- if(jQuery(this).children().size() == 0) {
+ if(jQuery(this).children().length == 0) {
jQuery(this).remove();
}
});
diff --git a/themes/common-theme/webapp/common-theme/js/util/fieldlookup.js
b/themes/common-theme/webapp/common-theme/js/util/fieldlookup.js
index b9d266fa60..ae3d8d6938 100644
--- a/themes/common-theme/webapp/common-theme/js/util/fieldlookup.js
+++ b/themes/common-theme/webapp/common-theme/js/util/fieldlookup.js
@@ -620,6 +620,9 @@ function lookupAjaxRequest(request) {
}
function lookupFormAjaxRequest(formAction, form) {
+ if (!form) {
+ return;
+ }
var lookupId = GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).lookupId;
var data = jQuery("#" + form).serialize();
data = data + "&presentation=" +
GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).presentation;
diff --git
a/themes/common-theme/webapp/common-theme/js/util/miscAjaxFunctions.js
b/themes/common-theme/webapp/common-theme/js/util/miscAjaxFunctions.js
index e7fb1752dc..e749273680 100644
--- a/themes/common-theme/webapp/common-theme/js/util/miscAjaxFunctions.js
+++ b/themes/common-theme/webapp/common-theme/js/util/miscAjaxFunctions.js
@@ -35,6 +35,9 @@ function getDependentDropdownValues(request, paramKey,
paramField, targetField,
// this is to handle a specific case where an input field is
needed instead of a drop-down when no values are returned by the request
// this will be maybe extended later to use an auto-completed
drop-down or a lookup, instead of straight drop-down currently, when there are
too much values to populate
// this is e.g. currently used in the Product Price Rules screen
+ if (!paramField) {
+ return;
+ }
target = '#' + targetField;
input = '#' + inputField;
targetTitle = target + '_title'
@@ -49,6 +52,9 @@ function getDependentDropdownValues(request, paramKey,
paramField, targetField,
// Both arrays should be the same length
for (var i=0; i<paramKeyArr.length; i++) {
+ if (!paramFieldArr[i]) {
+ continue;
+ }
paramData.push({name: paramKeyArr[i], value: jQuery('#' +
paramFieldArr[i]).val()});
}
} else {
diff --git
a/themes/common-theme/webapp/common-theme/js/util/selectMultipleRelatedValues.js
b/themes/common-theme/webapp/common-theme/js/util/selectMultipleRelatedValues.js
index 1b25c1a9c2..cfae9c07e3 100644
---
a/themes/common-theme/webapp/common-theme/js/util/selectMultipleRelatedValues.js
+++
b/themes/common-theme/webapp/common-theme/js/util/selectMultipleRelatedValues.js
@@ -27,6 +27,9 @@
// responseName = result returned by the service (using a standard json
response, ie chaining json request)
function selectMultipleRelatedValues(request, paramKey, paramField,
targetField, type, typeValue, responseName) {
+ if (!paramField || !targetField) {
+ return;
+ }
data = [ { name: paramKey, value: jQuery('#' + paramField).val()}, { name:
type, value: typeValue} ]; // get requested value from parent dropdown field
list = jQuery.post(request, data, function(result) {
selectedOptions = result[responseName];
diff --git a/themes/helveticus/webapp/helveticus/js/OfbizUtil.js
b/themes/helveticus/webapp/helveticus/js/OfbizUtil.js
index 57d557e4d6..cb37fec27a 100644
--- a/themes/helveticus/webapp/helveticus/js/OfbizUtil.js
+++ b/themes/helveticus/webapp/helveticus/js/OfbizUtil.js
@@ -20,6 +20,9 @@
function setLookDescription(textFieldId, description, params, formName,
showDescription) {
+ if (!textFieldId) {
+ return;
+ }
if (description) {
var start = description.lastIndexOf(' [');
if (start != -1) {
