Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

$_widgetPossibility #2249

Merged
merged 2 commits into from Jul 14, 2023
Merged

$_widgetPossibility #2249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
230258e
Update cmd.configure.php
Phpvarious Jul 14, 2023
748c633
Update cmd.class.php
Phpvarious Jul 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/class/cmd.class.php
View file
Open in desktop
Expand Up @@ -2508,6 +2508,9 @@ public function widgetPossibility($_key = '', $_default = true) {
if (property_exists($class, '_widgetPossibility')) {
$return = $class::$_widgetPossibility;
if ($_key != '') {
if (isset($return[$_key])) {
return $return[$_key];
}
$keys = explode('::', $_key);
foreach ($keys as $k) {
if (!isset($return[$k])) {
Expand Down
40 changes: 23 additions & 17 deletions desktop/modal/cmd.configure.php
View file
Open in desktop
Expand Up @@ -995,24 +995,30 @@
})
},
displayWidgetHelp: function(_widgetName) {
jeedom.cmd.getWidgetHelp({
id: document.querySelector('#cmd_information span[data-l1key="id"]').textContent,
version: 'dashboard',
widgetName: _widgetName,
error: function(error) {
document.getElementById('optionalParamHelp').empty().textContent = '{{Pas de description des paramètres optionnels sur ce Widget.}}'
},
success: function(data) {
document.getElementById('optionalParamHelp').empty().innerHTML = data.html
}
})
if (document.getElementById('optionalParamHelp')) {
jeedom.cmd.getWidgetHelp({
id: document.querySelector('#cmd_information span[data-l1key="id"]').textContent,
version: 'dashboard',
widgetName: _widgetName,
error: function(error) {
document.getElementById('optionalParamHelp').empty().textContent = '{{Pas de description des paramètres optionnels sur ce Widget.}}'
},
success: function(data) {
document.getElementById('optionalParamHelp').empty().innerHTML = data.html
}
})
}
},
synchModalToCmd: function() {
var cmdId = document.querySelector('#div_displayCmdConfigure .cmdAttr[data-l1key="id"]').textContent
var cmdTr = document.querySelector('#div_pageContainer tr[data-cmd_id="' + cmdId + '"]')
if (cmdTr) {
cmdTr.querySelector('input.cmdAttr[data-l1key="isVisible"]').checked = document.querySelector('#div_displayCmdConfigure input.cmdAttr[data-l1key="isVisible"').checked
cmdTr.querySelector('.cmdAttr[data-l1key="display"][data-l2key="icon"]').innerHTML = document.querySelector('#div_displayCmdConfigure .cmdAttr[data-l1key="display"][data-l2key="icon"]').innerHTML
if (cmdTr.querySelector('input.cmdAttr[data-l1key="isVisible"]')) {
cmdTr.querySelector('input.cmdAttr[data-l1key="isVisible"]').checked = document.querySelector('#div_displayCmdConfigure input.cmdAttr[data-l1key="isVisible"').checked
}
if (cmdTr.querySelector('.cmdAttr[data-l1key="display"][data-l2key="icon"]')) {
cmdTr.querySelector('.cmdAttr[data-l1key="display"][data-l2key="icon"]').innerHTML = document.querySelector('#div_displayCmdConfigure .cmdAttr[data-l1key="display"][data-l2key="icon"]').innerHTML
}
}
},
syncModalToScenario: function() {
Expand Down Expand Up @@ -1085,7 +1091,7 @@
if (!isset(cmd.display)) cmd.display = {}
if (!isset(cmd.display.parameters)) cmd.display.parameters = {}

document.querySelector('#cmd_display #table_widgetParametersCmd').tBodies[0].childNodes.forEach(_tr => {
document.querySelector('#cmd_display #table_widgetParametersCmd')?.tBodies[0].childNodes.forEach(_tr => {
if (_tr.nodeType != 3) {
cmd.display.parameters[_tr.querySelector('.key').jeeValue()] = _tr.querySelector('.value').jeeValue()
}
Expand Down Expand Up @@ -1135,12 +1141,12 @@
if (!isset(cmd.display.parameters)) cmd.display.parameters = {}

if (document.querySelector('#cmd_display #table_widgetParametersCmd')) {
document.querySelector('#cmd_display #table_widgetParametersCmd').tBodies[0].childNodes.forEach(_tr => {
document.querySelector('#cmd_display #table_widgetParametersCmd')?.tBodies[0].childNodes.forEach(_tr => {
if (_tr.nodeType != 3) {
cmd.display.parameters[_tr.querySelector('.key').jeeValue()] = _tr.querySelector('.value').jeeValue()
}
})
}
} else delete cmd.display.parameters;

try {
var checkCmdParameter = document.getElementById('div_jeedomCheckCmdCmdOption').getJeeValues('.expressionAttr')[0]
Expand Down Expand Up @@ -1574,4 +1580,4 @@

jeeM.postInit()
})()
</script>
</script>