Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
106 changes: 106 additions & 0 deletions assets/components/clientconfig/js/mgr/sections/home.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,51 @@
// source: https://stackoverflow.com/a/6832721/1166642
function versionCompare(v1, v2, options) {
var lexicographical = options && options.lexicographical,
zeroExtend = options && options.zeroExtend,
v1parts = v1.split('.'),
v2parts = v2.split('.');

function isValidPart(x) {
return (lexicographical ? /^\d+[A-Za-z]*$/ : /^\d+$/).test(x);
}

if (!v1parts.every(isValidPart) || !v2parts.every(isValidPart)) {
return NaN;
}

if (zeroExtend) {
while (v1parts.length < v2parts.length) v1parts.push("0");
while (v2parts.length < v1parts.length) v2parts.push("0");
}

if (!lexicographical) {
v1parts = v1parts.map(Number);
v2parts = v2parts.map(Number);
}

for (var i = 0; i < v1parts.length; ++i) {
if (v2parts.length == i) {
return 1;
}

if (v1parts[i] == v2parts[i]) {
continue;
}
else if (v1parts[i] > v2parts[i]) {
return 1;
}
else {
return -1;
}
}

if (v1parts.length != v2parts.length) {
return -1;
}

return 0;
}

ClientConfig.page.Home = function(config) {
config = config || {};
Ext.applyIf(config,{
Expand Down Expand Up @@ -130,6 +178,64 @@ Ext.extend(ClientConfig.page.Home,MODx.Component,{
field.checked = (value.value);
}

var hasRadioGroupCompatibleVersion = false,
minModx2RGVersion = "2.8.7",
minModx3RGVersion = "3.0.4";

if (MODx && MODx.config && MODx.config.version) {
var modxVersion = MODx.config.version.substring(0, MODx.config.version.length - 3),
modxVersionMajor = parseInt(modxVersion.substring(0, 1));

if (modxVersionMajor === 2) {
hasRadioGroupCompatibleVersion = versionCompare(modxVersion, minModx2RGVersion) !== -1;
} else if (modxVersionMajor === 3) {
hasRadioGroupCompatibleVersion = versionCompare(modxVersion, minModx3RGVersion) !== -1;
} else if (modxVersionMajor > 3) {
hasRadioGroupCompatibleVersion = true;
}
}

if (((field.xtype === 'radiogroup') || (field.xtype === 'xradiogroup')) && hasRadioGroupCompatibleVersion) {
field.xtype = 'radiogroup';
field.columns = 4;
field.items = [];

var options = value.options.split('||');
Ext.each(options, function(option) {
option = option.split('==');
if (option[1]) {
field.items.push({
boxLabel: option[0],
inputValue: option[1],
checked: option[1] === field.value ? true : false,
name: field.name
})
} else {
field.items.push({
boxLabel: option[0],
inputValue: option[0],
checked: option[0] === field.value ? true : false,
name: field.name
})
}
});
} else if ((field.xtype === 'radiogroup') || (field.xtype === 'xradiogroup')) {
field.xtype = 'radiogroup';

var extMC = new Ext.util.MixedCollection();

field.items = [{
boxLabel: 'Feature not available in your MODX-version, please update to at least version ' + (modxVersionMajor === 2 ? minModx2RGVersion : minModx3RGVersion),
inputValue: 0,
checked: true,
name: field.name
}];

extMC.addAll(field.items);
field.items = extMC;
field.items[0] = extMC.items;
}

if (field.xtype === 'datefield') {
field.format = MODx.config.manager_date_format;
}
Expand Down
3 changes: 2 additions & 1 deletion assets/components/clientconfig/js/mgr/widgets/combos.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ ClientConfig.combo.FieldTypes = function(config) {
['numberfield', _('clientconfig.xtype.numberfield')],
['colorpickerfield', _('clientconfig.xtype.colorpalette')],
['email', _('clientconfig.xtype.email')],
['xradiogroup', _('clientconfig.xtype.radiogroup')],
['xcheckbox', _('clientconfig.xtype.xcheckbox')],
['datefield', _('clientconfig.xtype.datefield')],
['timefield', _('clientconfig.xtype.timefield')],
Expand Down Expand Up @@ -113,4 +114,4 @@ Ext.reg('clientconfig-combo-contexts',ClientConfig.combo.ContextList);
ClientConfig.ux.Line = Ext.extend(Ext.Component, {
autoEl: 'hr'
});
Ext.reg('clientconfig-line', ClientConfig.ux.Line);
Ext.reg('clientconfig-line', ClientConfig.ux.Line);
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ ClientConfig.window.Setting = function(config) {
anchor: '100%',
listeners: {
select: {fn: function(field, record) {
if (record.data.xtype === 'modx-combo') {
if (['modx-combo', 'radiogroup', 'xradiogroup'].indexOf(record.data.xtype) !== -1) {
Ext.getCmp(config.id + '-options').show();
Ext.getCmp(config.id + '-process_options').show();
} else {
Expand All @@ -97,7 +97,7 @@ ClientConfig.window.Setting = function(config) {
fieldLabel: _('clientconfig.options'),
description: _('clientconfig.options.desc'),
anchor: '100%',
hidden: (config.record && (config.record.xtype === 'modx-combo')) ? false : true
hidden: (config.record && (['modx-combo', 'radiogroup', 'xradiogroup'].indexOf(config.record.xtype) !== -1)) ? false : true
},{
xtype: 'checkbox',
id: config.id + '-process_options',
Expand Down
2 changes: 1 addition & 1 deletion core/components/clientconfig/controllers/home.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function process(array $scriptProperties = []) {
$googleFontsApiKey = $this->modx->getOption('clientconfig.google_fonts_api_key', null, '');
$sa['xtype'] = empty($googleFontsApiKey) ? 'textfield' : $sa['xtype'];
}
elseif ($sa['xtype'] === 'modx-combo' && $setting->get('process_options')) {
elseif ($setting->get('process_options') && in_array($sa['xtype'], ['modx-combo', 'radiogroup', 'xradiogroup'], true)) {
$inputOpts = $setting->get('options');
$this->modx->getParser();
$this->modx->parser->processElementTags('', $inputOpts, true, true);
Expand Down
3 changes: 3 additions & 0 deletions core/components/clientconfig/lexicon/en/default.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,6 @@
$_lang['clientconfig.xtype.line'] = 'Line (divider)';
$_lang['clientconfig.xtype.code'] = 'Code (requires Ace editor installed)';
$_lang['clientconfig.xtype.email'] = 'Email';

// New 2023-02-26
$_lang['clientconfig.xtype.radiogroup'] = 'Radio Group';