e8fbfb14c1
Add coexistence checks to all enqueue methods to prevent loading both React and Grid.js assets simultaneously. Changes: - ReactAdmin.php: Only enqueue React assets when ?react=1 - Init.php: Skip Grid.js when React active on admin pages - Form.php, Coupon.php, Access.php: Restore classic assets when ?react=0 - Customer.php, Product.php, License.php: Add coexistence checks Now the toggle between Classic and React versions works correctly. Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
54 lines
1.5 KiB
JavaScript
54 lines
1.5 KiB
JavaScript
/**
|
|
* @filedescription Merge Strategy
|
|
*/
|
|
|
|
"use strict";
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// Class
|
|
//-----------------------------------------------------------------------------
|
|
|
|
/**
|
|
* Container class for several different merge strategies.
|
|
*/
|
|
class MergeStrategy {
|
|
|
|
/**
|
|
* Merges two keys by overwriting the first with the second.
|
|
* @param {*} value1 The value from the first object key.
|
|
* @param {*} value2 The value from the second object key.
|
|
* @returns {*} The second value.
|
|
*/
|
|
static overwrite(value1, value2) {
|
|
return value2;
|
|
}
|
|
|
|
/**
|
|
* Merges two keys by replacing the first with the second only if the
|
|
* second is defined.
|
|
* @param {*} value1 The value from the first object key.
|
|
* @param {*} value2 The value from the second object key.
|
|
* @returns {*} The second value if it is defined.
|
|
*/
|
|
static replace(value1, value2) {
|
|
if (typeof value2 !== "undefined") {
|
|
return value2;
|
|
}
|
|
|
|
return value1;
|
|
}
|
|
|
|
/**
|
|
* Merges two properties by assigning properties from the second to the first.
|
|
* @param {*} value1 The value from the first object key.
|
|
* @param {*} value2 The value from the second object key.
|
|
* @returns {*} A new object containing properties from both value1 and
|
|
* value2.
|
|
*/
|
|
static assign(value1, value2) {
|
|
return Object.assign({}, value1, value2);
|
|
}
|
|
}
|
|
|
|
exports.MergeStrategy = MergeStrategy;
|