From 2c1766e3f778eea7b140ab23eb9f2d78c71d3e4d Mon Sep 17 00:00:00 2001 From: Thomas Vincent Date: Sun, 8 Nov 2026 18:22:06 -0800 Subject: [PATCH 1/6] refactor: split the map editor script into cohesive files Move the dialog helpers, the graph and icon pickers, the compact link and node property editors, and the image and colour library out of js/editor.js into editor.dialogs.js, editor.picker.js, editor.compact.js and editor.assets.js. The moved code is unchanged. Functions stay browser globals because inline handlers and the rest of the editor call them by name; each new file also exports its functions under CommonJS, as editor.js already does, for Node checks. Both pages that include editor.js now include the new files right after it. The browser checks load whole files through a shared helper instead of slicing source by function name, so moving a function no longer breaks them silently. Signed-off-by: Thomas Vincent --- js/editor.assets.js | 209 +++ js/editor.compact.js | 744 ++++++++++ js/editor.dialogs.js | 82 ++ js/editor.js | 1302 ----------------- js/editor.picker.js | 286 ++++ lib/editor.inc.php | 4 + tests/Browser/ConfigCancelTest.cjs | 6 +- tests/Browser/EditorColoursTest.cjs | 9 +- tests/Browser/EditorContextMenuTest.cjs | 12 +- .../Browser/EditorFilenameNavigationTest.cjs | 5 +- tests/Browser/EditorHotspotTest.cjs | 4 +- tests/Browser/EditorIconPickerTest.cjs | 4 +- tests/Browser/EditorImagesTest.cjs | 3 +- tests/Browser/EditorNotesTest.cjs | 9 +- tests/Browser/EditorPickerLayeringTest.cjs | 4 +- tests/Browser/EditorPickerReopeningTest.cjs | 3 +- tests/Browser/EditorPropertySubmitTest.cjs | 8 +- tests/Browser/EditorReturnNavigationTest.cjs | 11 +- tests/Browser/EditorSaveFailureTest.cjs | 5 +- tests/Browser/EditorWorkflowTest.cjs | 15 +- tests/Browser/LinkSourcePickerTest.cjs | 4 +- tests/Browser/NodeLabelPositionTest.cjs | 5 +- tests/Browser/PickerPaginationTest.cjs | 4 +- tests/Browser/README.md | 5 + tests/Browser/editorScripts.cjs | 22 + weathermap-cacti-plugin-editor.php | 4 + 26 files changed, 1397 insertions(+), 1372 deletions(-) create mode 100644 js/editor.assets.js create mode 100644 js/editor.compact.js create mode 100644 js/editor.dialogs.js create mode 100644 js/editor.picker.js create mode 100644 tests/Browser/editorScripts.cjs diff --git a/js/editor.assets.js b/js/editor.assets.js new file mode 100644 index 00000000..8d7a7165 --- /dev/null +++ b/js/editor.assets.js @@ -0,0 +1,209 @@ +// Image library and colour scale editors for the map editor; loaded after editor.js. + +function wmAssetRequest(action, extra, callback, errorId) { + var values = {action: action, mapname: $('#mapname').val()}; + if (action !== 'image_data' && typeof WMConfigRevision !== 'undefined') values.config_revision = WMConfigRevision; + if (typeof csrfMagicToken !== 'undefined') values.__csrf_magic = csrfMagicToken; + $.ajax({url: editor_url, type: action === 'image_data' ? 'GET' : 'POST', dataType: 'json', data: $.extend(values, extra), + success: callback, error: function(xhr) { $('#' + errorId).text(xhr.responseJSON && xhr.responseJSON.error || wmEditorText.imageText3); }}); +} +function wmAssetImages(images) { + $('#wm-images-objects, #wm-images-backgrounds').empty(); + images.forEach(function(item) { + var card = $('
').appendTo('#wm-images-' + item.kind); + var src = wmEditorImageSrc(item.url); + if (src) { + var image = document.createElement('img'); + image.src = src; + image.alt = item.name; + image.loading = 'lazy'; + card.append(image); + } + $('').text(item.name).appendTo(card); + if (item.width && item.height) $('').text(item.width + ' × ' + item.height + ' px').appendTo(card); + $('').text(item.users && item.users.length ? wmEditorText.imageUsed.replace('%s', item.users.join(', ')) : wmEditorText.imageUnused).appendTo(card); + if (item.deletable !== false) $('') + .attr({id:id+'-button', 'aria-controls':id}).text(title).appendTo(controls) + .on('click', function() { + var open = $(this).attr('aria-expanded') !== 'true'; + controls.find('.wm-link-section-toggle').attr('aria-expanded', 'false').removeClass('ui-state-active'); + sections.find('.wm-link-group').prop('hidden', true); + $(this).attr('aria-expanded', String(open)).toggleClass('ui-state-active', open); + panel.prop('hidden', !open); + if (dlg.dialog('instance')) dlg.dialog('option', 'position', {my:'center', at:'center', of:window}); + }); + if (hint) $('').text(hint).appendTo(panel); + var table = $('
').appendTo(panel); + dlg.find(fields).closest('tr').appendTo(table); + return panel; + } + $('#link_labelposmode').on('change.wmPositions', function() { + $('#link_labelposin,#link_labelposout').prop('disabled', $(this).val() !== 'custom'); + }); + var hovers = group('wm-link-hovers', wmEditorText.additionalGraphs, '#link_template,#link_picker'); + dlg.find('.wm-link-section p').addClass('wm-link-group-hint').prependTo(hovers); + dlg.find('.wm-link-section').remove(); + $('').append($('#link_picker_add,#link_picker_rep')).appendTo($('#link_picker').closest('td')); + $('').appendTo($('#link_picker').closest('td')); + $('').appendTo(hovers); + wmRenderLinkExtraGraphs(); + $('#link_target_picker_rep').remove(); + var advanced = group('wm-link-advanced', wmEditorText.advanced, + '#link_labelposmode,#link_target,#link_infourl,#wm-link-primary-hover,#wm-link-extra-hover', wmEditorText.linkAdvancedHint); + $('#link_labelposmode').closest('tr').prependTo(advanced.find('table')); + var sourceRow = $('').insertBefore($('#link_target').closest('tr')); + $('').text(wmEditorText.chooseSource).appendTo(sourceRow); + var sourceActions = $('').appendTo($('').appendTo(sourceRow)) + .append($('#link_target_picker_add')); + wmInitLinkSourcePicker(sourceActions); + $('').text(wmEditorText.trafficSourcesHint).appendTo(sourceActions.parent()); + $('').insertBefore('#link_target'); + $('').attr('aria-label', wmEditorText.trafficSources).insertBefore('#link_target'); + $('#link_target').off('.wmExpert').on('input.wmExpert', function() { + ++wmInterfaceLookupGeneration; + $('#wm-link-current').text(wmEditorText.customInterface); + $('#wm-link-graph').text(wmEditorText.customConfig); + $('#link_target_picker').val('').removeData('wm-choice'); + $('#link_target_picker_input').val(''); + $('#wm-link-use').prop('disabled', true); + wmRenderLinkTrafficSources(); + $('#wm-link-source-status').text(wmEditorText.customSourcesChanged); + }); + $('#link_infourl,#wm-link-primary-hover,#wm-link-extra-hover').off('.wmExpert').on('input.wmExpert change.wmExpert', function() { + ++wmInterfaceLookupGeneration; + wmSyncLinkHoverParts(); + }); + dlg.find('#viastyle,#link_width,#link_commentin,#link_commentout,#link_commentstyle').closest('tr') + .insertAfter($('#link_target_picker').closest('tr')); + $('#link_edit').appendTo(controls); + var help = dlg.find('.dlgHelp').attr('id', 'wm-link-full-help').insertAfter(sections).hide(); + $('') + .attr({'aria-label': wmEditorText.linkHelp, title: wmEditorText.linkHelp}).appendTo(controls) + .on('click', function() { + var open = $(this).attr('aria-expanded') !== 'true'; + $(this).attr('aria-expanded', String(open)); + help.toggle(open); + if (dlg.dialog('instance')) dlg.dialog('option', 'position', {my:'center', at:'center', of:window}); + }); + function hint(id, field, text) { + $('').attr('id', id).text(text).appendTo(dlg.find(field).closest('td')); + var input = dlg.find(field), described = String(input.attr('aria-describedby') || '').split(/\s+/).filter(Boolean); + if (!described.includes(id)) described.push(id); + input.attr('aria-describedby', described.join(' ')); + } + hint('wm-link-bandwidth-hint', '#link_bandwidth_in', wmEditorText.bandwidthHint); + hint('wm-link-comments-hint', '#link_commentout', wmEditorText.commentsHint); + hint('wm-link-destination-hint', '#link_infourl', wmEditorText.clickDestinationHint); + hint('wm-link-extra-url-hint', '#wm-link-extra-hover', wmEditorText.extraUrlsHint); +} + +function compactLinkEditorBase() { + wmInitLinkHoverParts(); + var dlg = $('#dlgLinkProperties'), + table = $('#link_bandwidth_in').closest('table'); + wmBuildLinkSections(); + wmRenderLinkTrafficSources(); + wmRestoreLinkGraphChoice(); + $('#wm-link-source-status').text(wmEditorText.chooseSourceFirst); + $('#wm-link-source-picker').val('').removeData('wm-choice'); + $('#link_target_picker_add').prop('disabled', true); + $('#wm-link-full-help').hide(); + $('#wm-link-help-button').attr('aria-expanded', 'false'); + $('#wm-link-primary-hover').prop('readonly', false).next('small').text(wmEditorText.trafficHoverHint); + if (!$('#wm-link-summary').length) { + $( + '' + ).prependTo(table).find('td:first').text(wmEditorText.currentInterface); + $( + '' + ) + .text(wmEditorText.useInterface) + .appendTo($('#link_target_picker').closest('td')) + .on('click', function () { + var item = $('#link_target_picker').data('wm-choice'); + if (!item || !item.id || !(item.local_graph_id > 0)) return; + ++wmInterfaceLookupGeneration; + var extras = wmLinkHoverEntries($('#link_target').val()).slice(1).filter(function(source) { return !wmLinkSameTrafficSource(source, String(item.id)); }); + $('#link_target').val([String(item.id)].concat(extras).join(' ')); + wmRenderLinkTrafficSources(); + var destination = new URL(infoUrlTarget + item.local_graph_id, new URL('../../', window.location.href)); + $('#link_infourl').val(destination.pathname + destination.search + destination.hash); + wmSetLinkPrimaryHover( + new URL('../../', window.location.href).pathname + + 'graph_image.php?local_graph_id=' + + item.local_graph_id + + '&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300' + ); + $('#wm-link-current').text(item.label); + $('#wm-link-graph').text( + wmEditorText.graphSelected.replace('%s', String(item.local_graph_id)) + ); + $(this).prop('disabled', true); + }); + } + $('#wm-link-graph').prependTo('#wm-link-advanced'); + wmRenderLinkTrafficSources(); + $('#wm-link-sections').show().find('.wm-link-group').prop('hidden', true); + $('#wm-link-sections .wm-link-section-toggle').attr('aria-expanded', 'false').removeClass('ui-state-active'); + $('#link_edit').show(); + $('#link_target_picker_add').show(); + $('#link_target_picker').closest('tr').find('td:first').text(wmEditorText.changeInterface); + $('#link_target_picker_input').val('').attr('placeholder', wmEditorText.searchInterface); + $('#link_target_picker').val('').removeData('wm-choice'); + local_graph_id = 0; + $('#wm-link-use').prop('disabled', true); + var picker = $('#link_target_picker_input'); + if (!picker.data('wm-compact-hook')) { + var original = picker.autocomplete('option', 'select'); + picker + .autocomplete('option', 'select', function (event, ui) { + if (original && original.call(this, event, ui) === false) return false; + var valid = !!(ui.item.id && ui.item.local_graph_id > 0); + $('#link_target_picker').val(valid ? ui.item.id : '').data('wm-choice', valid ? ui.item : null); + local_graph_id = valid ? ui.item.local_graph_id : 0; + $('#wm-link-use').prop('disabled', !valid); + }) + .on('input.wmCompact', function () { + $('#link_target_picker').val('').removeData('wm-choice'); + local_graph_id = 0; + $('#wm-link-use').prop('disabled', true); + }); + picker.data('wm-compact-hook', true); + } + var target = String($('#link_target').val() || '').trim(); + $('#wm-link-current').text(target ? target.split('/').pop() : wmEditorText.noInterface); + var ids = String($('#link_infourl').val() || '').match(/(?:local_graph_id|graph_list)=([0-9,]+)/); + $('#wm-link-graph').text( + ids + ? wmEditorText.currentGraph.replace('%s', ids[1]) + : target + ? wmEditorText.customConfig + : wmEditorText.chooseInterface + ); + $('#link_bandwidth_in') + .closest('tr') + .find('td:first') + .text(wmEditorText.bandwidthIn.replace('%s', function() { return $('#link_nodename1').text(); })); + $('#link_bandwidth_out') + .closest('tr') + .find('td:first') + .text(wmEditorText.bandwidthOut.replace('%s', function() { return $('#link_nodename1').text(); })); +} + +var wmInterfaceSummaries = {}; +var wmInterfaceLookupGeneration = 0; +function wmGetInterfaceSummary(graphIds) { + var key = $('#mapname').val() + ':' + graphIds.join(','); + if (!wmInterfaceSummaries[key]) { + wmInterfaceSummaries[key] = $.getJSON(window.location.pathname, { + action: 'datasources', + term: '', + mapname: $('#mapname').val(), + target: 'link_target_picker', + graph_template_id: -1, + paged: 1, + graph_ids: graphIds.join(',') + }); + wmInterfaceSummaries[key].fail(function () { + delete wmInterfaceSummaries[key]; + }); + } + return wmInterfaceSummaries[key]; +} +function wmGetInterfaceCandidates(graphIds) { + var result = $.Deferred(); + var unique = Array.from(new Set(graphIds)); + var items = []; + var successes = 0; + function next(offset) { + if (offset >= unique.length) { + if (successes || !unique.length) result.resolve({items: items}); + else result.reject(); + return; + } + wmGetInterfaceSummary(unique.slice(offset, offset + 100)).done(function(data) { + items = items.concat(data.items); + successes++; + }).always(function() { next(offset + 100); }); + } + next(0); + return result.promise(); +} +function compactLinkEditor() { + var generation = ++wmInterfaceLookupGeneration; + compactLinkEditorBase(); + var dlg = $('#dlgLinkProperties'); + if (!$('#wm-link-rrd').length) + $('').insertAfter( + '#wm-link-current' + ); + + var buttons = dlg.find('.dlgSubButtons'); + $('#tb_link_submit').prependTo(buttons).css({ 'font-weight': 'bold' }); + $('#tb_link_cancel').insertAfter('#tb_link_submit'); + if (!$('#wm-link-delete-bar').length) + $('').insertBefore( + $('#link_nodename1').parent() + ); + $('#link_delete').appendTo('#wm-link-delete-bar').css({ 'margin-left': '0', color: '#9b2525' }); + $('#link_tidy').show().insertBefore('#tb_link_submit'); + $('#link_via').show().insertAfter('#link_tidy').css('margin-right', '24px'); + var picker = $('#link_target_picker_input'); + picker.attr('placeholder', wmEditorText.browseInterface); + picker.autocomplete('option', 'autoFocus', false); + $('#link_target_picker_wrap').off('click dblclick mouseleave'); + picker.off('click.wmReopen').on('click.wmReopen', function () { + picker.autocomplete('search', ''); + }); + $('#link_target_picker_click') + .off('click.wmReopen') + .on('click.wmReopen', function () { + picker.trigger('focus'); + picker.autocomplete('search', ''); + }); + if (!$('#wm-link-browse').length) + $('') + .text(wmEditorText.browseAll) + .insertAfter('#wm-link-use') + .on('click', function () { + picker.trigger('focus'); + picker.autocomplete('search', ''); + }); + if (!$('#wm-link-apply-hint').length) + $('
').insertBefore(table); + $('#node_delete').text(wmEditorText.deleteNode).appendTo('#wm-node-delete-bar').css('color', '#9b2525'); + var buttons = dlg.find('.dlgSubButtons'); + $('#node_move').prependTo(buttons); + $('#node_clone').insertAfter('#node_move').css('margin-right', '24px'); + $('#tb_node_submit').insertAfter('#node_clone').css('font-weight', 'bold'); + $('#tb_node_cancel').insertAfter('#tb_node_submit'); + if (!$('#wm-node-toggle').length) { + $('') + .text(wmEditorText.advanced) + .insertBefore(dlg.find('.dlgButtons')) + .on('click', function () { + var open = $(this).attr('aria-expanded') !== 'true'; + $(this) + .attr('aria-expanded', String(open)) + .text(open ? wmEditorText.hideAdvanced : wmEditorText.advanced); + rows.toggle(open); + dlg.find('#node_edit,.dlgHelp').toggle(open); + }); + $( + '
' + ).text(wmEditorText.nodePurpose).insertAfter('#wm-node-toggle'); + dlg.find('.dlgHelp').empty().append( + $('

').text(wmEditorText.nodeDisplayHelp), + $('

').text(wmEditorText.nodeHoverHelp), + $('

').text(wmEditorText.nodeAdvancedHelp) + ); + } + rows.hide(); + dlg.find('#node_edit,.dlgHelp').hide(); + $('#wm-node-toggle').attr('aria-expanded', 'false').text(wmEditorText.advanced); +} + +function refineNodePicker() { + var picker = $('#node_picker_input'), + buttons = $('#node_picker_add,#node_picker_rep'); + picker.val('').attr('placeholder', wmEditorText.searchGraph); + $('#node_picker').val(''); + buttons.prop('disabled', true); + picker.autocomplete('option', 'autoFocus', false); + $('#node_picker_wrap').off('click dblclick mouseleave'); + picker.off('click.wmNode').on('click.wmNode', function () { + picker.autocomplete('search', ''); + }); + $('#node_picker_click') + .off('click.wmNode') + .on('click.wmNode', function () { + picker.trigger('focus'); + picker.autocomplete('search', ''); + }); + if (!picker.data('wm-node-hook')) { + var original = picker.autocomplete('option', 'select'); + picker.autocomplete('option', 'select', function (event, ui) { + if (original && original.call(this, event, ui) === false) return false; + buttons.prop('disabled', !ui.item.id); + }); + picker.on('input.wmNode', function () { + buttons.prop('disabled', true); + }); + picker.data('wm-node-hook', true); + } + if (!$('#wm-node-browse').length) + $('') + .text(wmEditorText.browseAll) + .appendTo($('#node_picker').closest('td')) + .on('click', function () { + picker.trigger('focus'); + picker.autocomplete('search', ''); + }); + if (!$('#wm-node-graphs').length) + $('

').insertBefore('#wm-node-toggle'); + var hover = String($('#node_hover').val() || ''); + var matches = []; + hover.trim().split(/\s+/).forEach(function(entry) { + matches = matches.concat(wmLocalGraphIds(entry, ['graph_image.php'])); + }); + $('#wm-node-graphs').text(wmNodeHoverSummary(hover, [])); + if (matches.length) + wmGetGraphSummaries(matches).done(function (items) { + if (String($('#node_hover').val() || '') !== hover) return; + var labels = items.filter(function (i) { + return matches.indexOf(String(i.id)) !== -1; + }); + $('#wm-node-graphs').text(wmNodeHoverSummary(hover, labels)); + if (labels.length === 1 && !picker.val()) picker.val(labels[0].label); + }); +} +// Only IDs from this installation's known graph endpoints are local candidates. +function wmLocalGraphIds(value, endpoints) { + try { + var root = new URL('../../', window.location.href); + var url = new URL(value, /^graph(?:_image|_view)?\.php(?:[?#]|$)/.test(value) ? root : window.location.href); + if (url.origin !== root.origin || !endpoints.some(function(endpoint) { return url.pathname === root.pathname + endpoint; })) return []; + var ids = url.searchParams.get(url.pathname.endsWith('/graph_view.php') ? 'graph_list' : 'local_graph_id'); + return ids && /^[0-9]+(?:,[0-9]+)*$/.test(ids) ? ids.split(',') : []; + } catch (error) { + return []; + } +} +function wmNodeHoverSummary(hover, items) { + var entries = hover.trim().split(/\s+/).filter(Boolean); + if (!entries.length) return wmEditorText.noHover; + var labels = new Map(items.map(function(item) { return [String(item.id), item.label]; })); + var summary = entries.map(function(entry) { + var graph = wmLocalGraphIds(entry, ['graph_image.php']); + return graph.length ? (labels.get(graph[0]) || wmEditorText.unavailableGraph) : wmEditorText.customImages; + }); + return wmEditorText.hoverSummary.replace('%s', function() { return summary.join('; '); }); +} +function wmGetGraphSummaries(ids) { + var result = $.Deferred(); + var unique = Array.from(new Set(ids)); + var labels = []; + function next(offset) { + if (offset >= unique.length) { + result.resolve(labels); + return; + } + $.getJSON(window.location.pathname, { + action: 'graphs', term: '', mapname: $('#mapname').val(), + target: 'node_picker', graph_template_id: -1, paged: 1, include_rrds: '1', + graph_ids: unique.slice(offset, offset + 100).join(',') + }).done(function(data) { + labels = labels.concat(data.items); + next(offset + 100); + }).fail(function() { result.reject(); }); + } + next(0); + return result.promise(); +} +function wmNodeDisplayName(name) { + var node = Nodes[name]; + var label = node ? String(node.label || '').trim() : ''; + return label && label !== 'Node' ? label.replace(/\\n/g, ' ').replace(/\s+/g, ' ') : name; +} +function wmFriendlyLinkNames() { + var link = Links[$('#link_name').val()]; + if (!link) return; + $('#link_nodename1').text(wmNodeDisplayName(link.a)); + $('#link_nodename2').text(wmNodeDisplayName(link.b)); + $('#link_bandwidth_in') + .closest('tr') + .find('td:first') + .text(wmEditorText.bandwidthIn.replace('%s', function() { return wmNodeDisplayName(link.a); })); + $('#link_bandwidth_out') + .closest('tr') + .find('td:first') + .text(wmEditorText.bandwidthOut.replace('%s', function() { return wmNodeDisplayName(link.a); })); + if (!$('#wm-link-internal-id').length) + $('').insertBefore( + $('#wm-link-advanced').find('table') + ); + $('#wm-link-internal-id') + .text(wmEditorText.internalLink.replace('%s', function() { return link.name; })); + +} + +if (typeof module !== 'undefined' && module.exports) { + module.exports = {wmLinkHoverEntries: wmLinkHoverEntries, wmLinkCompactHoverUrl: wmLinkCompactHoverUrl, wmSyncLinkHoverParts: wmSyncLinkHoverParts, wmRenderLinkExtraGraphs: wmRenderLinkExtraGraphs, wmInitLinkHoverParts: wmInitLinkHoverParts, wmSetLinkPrimaryHover: wmSetLinkPrimaryHover, wmPromoteLinkTrafficHover: wmPromoteLinkTrafficHover, wmSetLinkExtraHover: wmSetLinkExtraHover, wmLinkTrafficIdentity: wmLinkTrafficIdentity, wmLinkSameTrafficSource: wmLinkSameTrafficSource, wmRenderLinkTrafficSources: wmRenderLinkTrafficSources, wmApplyLinkTrafficSource: wmApplyLinkTrafficSource, wmInitLinkSourcePicker: wmInitLinkSourcePicker, wmRestoreLinkGraphChoice: wmRestoreLinkGraphChoice, wmBuildLinkSections: wmBuildLinkSections, compactLinkEditorBase: compactLinkEditorBase, wmGetInterfaceSummary: wmGetInterfaceSummary, wmGetInterfaceCandidates: wmGetInterfaceCandidates, compactLinkEditor: compactLinkEditor, compactNodeEditor: compactNodeEditor, refineNodePicker: refineNodePicker, wmLocalGraphIds: wmLocalGraphIds, wmNodeHoverSummary: wmNodeHoverSummary, wmGetGraphSummaries: wmGetGraphSummaries, wmNodeDisplayName: wmNodeDisplayName, wmFriendlyLinkNames: wmFriendlyLinkNames}; +} diff --git a/js/editor.dialogs.js b/js/editor.dialogs.js new file mode 100644 index 00000000..dcf4481a --- /dev/null +++ b/js/editor.dialogs.js @@ -0,0 +1,82 @@ +// Property dialog management for the map editor; loaded after editor.js. + +function show_dialog(dlg) { + mapmode('existing'); + wmResetActionHelp(); + if (dlg == 'dlgMapProperties') { + var selectedNode = $('#map_bgfile').val(); + + if ($('#map_bgfile.dd-container').length) { + $('#map_bgfile').ddslick('destroy'); + } + + $('#map_bgfile').ddslick({ + height:240, + defaultSelectedIndex:selectedNode + }); + + $('.dd-container').on('click', function() { + $('.ui-dialog').css('z-index', '100'); + $('.dd-options, .dd-container').css('z-index', '500'); + }); + } + + $('#'+dlg).dialog({ + autoOpen: true, + width: dlg === 'dlgImages' ? Math.min(900, $(window).width() - 40) : 600, + height: 'auto', + modal: false, + resizable: false, + draggable: true, + close: function() { + $('#action').val(''); + mapmode('existing'); + if (dlg === 'dlgTextEdit') { + var parent = $(this).data('wm-config-parent'); + $(this).removeData('wm-config-parent'); + if (parent) { + show_dialog(parent); + $('#action').val(parent === 'dlgLinkProperties' ? 'set_link_properties' : 'set_node_properties'); + $(parent === 'dlgLinkProperties' ? '#link_edit' : '#node_edit').attr('tabindex', '-1').trigger('focus'); + } + } + }, + open: function() { + $(this).closest('.ui-dialog').addClass('wm-editor-dialog'); + $(this).find('.ui-autocomplete-input').each(function() { + $(this).autocomplete('option', 'appendTo', $(this).closest('.ui-dialog')); + }); + $('select').not('#node_iconfilename, #map_bgfile').not('.select2-hidden-accessible').selectmenu({ + open: function() { + $('.ui-dialog').css('z-index', '20'); + } + }); + } + }); +} + +function hide_dialog(dlg) { + if ($('#'+dlg).dialog('instance')) { + $('#'+dlg).dialog('close'); + } + + $('#action').val(''); +} + +function hide_all_dialogs() { + // Navigation to another task must not reopen the configuration editor's parent. + $('#dlgTextEdit').removeData('wm-config-parent'); + hide_dialog('dlgMapProperties'); + hide_dialog('dlgMapStyle'); + hide_dialog('dlgLinkProperties'); + hide_dialog('dlgTextEdit'); + hide_dialog('dlgNodeProperties'); + hide_dialog('dlgNoteProperties'); + hide_dialog('dlgColours'); + hide_dialog('dlgImages'); + hide_dialog('dlgEditorSettings'); +} + +if (typeof module !== 'undefined' && module.exports) { + module.exports = {show_dialog: show_dialog, hide_dialog: hide_dialog, hide_all_dialogs: hide_all_dialogs}; +} diff --git a/js/editor.js b/js/editor.js index 82f3075a..aace25a1 100644 --- a/js/editor.js +++ b/js/editor.js @@ -150,203 +150,6 @@ function sessionMessageCountdown(time) { }, 1000); } -function graphPicker() { - $('.selectmenu-ajax').each(function() { - var id = $(this).attr('id'); - var value = $(this).val(); - var title = 'Click to Search'; - var action = $(this).attr('data-action'); - var mapname = 'none'; - var pickerOffset = 0; - var pickerTerm = ''; - var pickerTemplate = null; - - if ($('#'+id+'_wrap').length) { - $('#'+id+'_wrap').remove(); - $('#'+id+'_add').remove(); - $('#'+id+'_rep').remove(); - } - - var dialogForm = ""; - dialogForm += ""; - dialogForm += ""; - dialogForm += ""; - dialogForm += ""; - dialogForm += " "; - dialogForm += " "; - if (id !== 'link_target_picker') dialogForm += ""; - - $(this).after(dialogForm); - $(this).hide(); - $('#' + id + '_add').text($(this).attr('data-add-label') || 'Add'); - $('#' + id + '_rep').text($(this).attr('data-replace-label') || 'Replace'); - $('#' + id + '_input').attr('aria-label', $(this).attr('aria-label') || $(this).closest('tr').find('td:first').text()); - - $('#' + id + '_add').off('click').on('click', function() { - var hover = 'graph_image.php?local_graph_id=';; - var infourl = infoUrlTarget; - - if (id == 'link_target_picker') { - wmApplyLinkTrafficSource(); - } else { - var hover = 'graph_image.php?local_graph_id=';; - var infourl = infoUrlTarget; - - if (id == 'link_picker') { - var target = String($('#' + id).val() || ''); - if (!/^[1-9][0-9]*$/.test(target)) return; - var graphUrl = new URL(hover + target, new URL('../../', window.location.href)); - wmSetLinkExtraHover(wmLinkCompactHoverUrl(graphUrl.pathname + graphUrl.search), false); - } else if (id == 'node_picker') { - var target = $('#' + id).val(); - var ehover = $('#node_hover').val(); - var einfo = $('#node_infourl').val(); - - if (einfo == '') { - einfo = infourl; - } - - $('#node_hover').val(ehover + (ehover != '' ? ' ':'') + hover + target); - - if (infoUrlStyle == 0) { - $('#node_infourl').val(einfo + (einfo != '' ? ',':'') + target); - } else { - $('#node_infourl').val(infourl + target); - } - } - } - }); - - $('#' + id + '_rep').off('click').on('click', function() { - if (id == 'link_picker') { - var target = String($('#' + id).val() || ''); - if (!/^[1-9][0-9]*$/.test(target)) return; - var graphUrl = new URL('graph_image.php?local_graph_id=' + target, new URL('../../', window.location.href)); - wmSetLinkExtraHover(wmLinkCompactHoverUrl(graphUrl.pathname + graphUrl.search), true); - } else if (id == 'node_picker') { - $('#node_hover').val('graph_image.php?local_graph_id=' + $('#' + id).val()); - $('#node_infourl').val(infoUrlTarget + $('#' + id).val()); - } - }); - - $('#' + id + '_input').autocomplete({ - source: function(request, response) { - if (id == 'node_picker') { - var template = $('#node_template').val(); - } else if (id == 'link_picker') { - var template = $('#link_template').val(); - } else { - var template = -1; - } - - if (request.term !== pickerTerm || template !== pickerTemplate) { - pickerOffset = 0; - } - pickerTerm = request.term; - pickerTemplate = template; - - var url = 'weathermap-cacti-plugin-editor.php' + - '?mapname=' + encodeURIComponent($('#mapname').val()) + - '&action=' + action + - '&term=' + encodeURIComponent(request.term) + - '&target=' + id + - '&graph_template_id='+template + '&paged=1&include_rrds=' + (id === 'link_picker' ? '1' : '0') + '&offset=' + pickerOffset; - - $.getJSON(url, function(data) { - var items = data.items; - if (data.offset > 0) { - items.unshift({label: data.previous_label, value: request.term, wmOffset: Math.max(0, data.offset - 100)}); - } - if (data.next_offset !== null) { - items.push({label: data.next_label, value: request.term, wmOffset: data.next_offset}); - } - response(items); - }).fail(function() { response([]); }); - }, - autoFocus: false, - minLength: 0, - focus: function(event, ui) { - if (ui.item.wmOffset !== undefined) { return false; } - }, - select: function(event, ui) { - if (ui.item.wmOffset !== undefined) { - pickerOffset = ui.item.wmOffset; - setTimeout(function() { $('#' + id + '_input').autocomplete('search', pickerTerm); }, 0); - return false; - } - $('#' + id + '_input').val(ui.item.label); - if (id === 'link_picker') $(this).data('wm-graph-choice', ui.item); - - if (ui.item.id) { - $('#' + id).val(ui.item.id); - local_graph_id = ui.item.local_graph_id; - } else { - $('#' + id).val(ui.item.value); - local_graph_id = ui.item.local_graph_id; - } - }, - open: function(event, ui) { - $('.ui-dialog').css('z-index', '20'); - $(this).css('z-index', '5000'); - } - }).css('border', 'none').css('background-color', 'transparent'); - - $('#' + id + '_wrap').on('dblclick', function() { - graphOpen = false; - clearTimeout(graphTimer); - clearTimeout(graphClickTimer); - $('#' + id + '_input').autocomplete('close').select(); - }).on('click', function() { - if (graphOpen) { - $('#'+'_input').autocomplete('close'); - clearTimeout(graphTimer); - graphOpen = false; - } else { - graphClickTimer = setTimeout(function() { - pickerOffset = 0; - $('#' + id + '_input').autocomplete('search', ''); - clearTimeout(graphTimer); - graphOpen = true; - }, 200); - } - $('#' + id + '_input').select(); - }).on('mouseleave', function() { - graphTimer = setTimeout(function() { $('#' + id + '_input').autocomplete('close'); }, 800); - }); - - var width = $('#' + id + '_input').textBoxWidth(); - if (width < 200) { - width = 200; - } - - $('#' + id + '_wrap').css('width', width+20); - $('#' + id + '_input').css('width', width); - $('#' + id + '_wrap').find('.ui-select-text').css('width', width); - - $('ul[id^="ui-id"]').on('mouseenter', function() { - clearTimeout(graphTimer); - }).on('mouseleave', function() { - graphTimer = setTimeout(function() { - $('#' + id + '_input').autocomplete('close'); - }, 800); - }); - - $('ul[id^="ui-id"] > li').on('mouseenter', function() { - $(this).addClass('ui-state-hover'); - }).on('mouseleave', function() { - $(this).removeClass('ui-state-hover'); - }); - - $('#' + id + '_wrap').on('mouseenter', function() { - $(this).addClass('ui-state-hover'); - $('input#' + id + '_input').addClass('ui-state-hover'); - }).on('mouseleave', function() { - $(this).removeClass('ui-state-hover'); - $('input#' + id + '_input').removeClass('ui-state-hover'); - }); - }); -} - $(document).on('unload', cleanupJS); $(function() { @@ -1316,91 +1119,6 @@ function show_node(name) { } } -/* Return an absolute preview URL for a relative path inside the plugin's - * images/ tree, or '' for anything else. URL parsing resolves dot segments - * (including percent-encoded ones) before the prefix check, so traversal out - * of images/ and other origins or schemes are rejected. */ -function wmEditorImageSrc(value) { - if (typeof value !== 'string' || !/^images\/[^?#\\]+\.(png|gif|jpe?g)$/i.test(value)) return ''; - try { - var image = new URL(value, document.baseURI); - var root = new URL('images/', document.baseURI); - return image.origin === root.origin && image.pathname.indexOf(root.pathname) === 0 ? image.href : ''; - } catch (error) { - return ''; - } -} - -function wmNodeIconPicker() { - var select = $('#node_iconfilename'); - if (select.hasClass('dd-container')) { - select.ddslick('destroy'); - select = $('#node_iconfilename'); - } - select.val(selectedNode).addClass('wm-icon-source'); - $('#wm-icon-picker').remove(); - var picker = $('
').insertAfter(select); - var summary = $('').appendTo(picker); - var panel = $('
').appendTo(picker); - var search = $('').attr({placeholder: wmEditorText.iconSearchPlaceholder, 'aria-label': wmEditorText.iconSearchLabel}).appendTo(panel); - var count = $('
').appendTo(panel); - var grid = $('
').attr({role: 'group', 'aria-label': wmEditorText.iconGroupLabel}).appendTo(panel); - function title(option) { - return option.text.replace(/\.(png|gif|jpe?g)$/i, '').replace(/[-_]+/g, ' '); - } - function content(target, option) { - var src = wmEditorImageSrc($(option).attr('data-imagesrc')); - if (src) { - var image = document.createElement('img'); - image.alt = ''; - image.src = src; - target.append(image); - } - $('').text(title(option)).appendTo(target); - } - function updateSelection() { - var option = select.find('option:selected')[0]; - summary.empty(); - if (option) content(summary, option); - else summary.text(wmEditorText.iconChoosePrompt); - grid.find('button').each(function() { - $(this).attr('aria-pressed', String($(this).data('value') === select.val())); - }); - } - select.find('option').each(function() { - var option = this; - var button = $('').text(wmEditorText.removeHoverGraph) - .appendTo(item).on('click', function() { - $('#wm-link-extra-hover').val(wmLinkHoverEntries($('#wm-link-extra-hover').val()).filter(function(entry) { return entry !== url; }).join('\n')); - wmSyncLinkHoverParts(); - }); - }); -} -function wmInitLinkHoverParts() { - if (!$('#wm-link-extra-hover').length) return; - var entries = wmLinkHoverEntries($('#link_hover').val()); - $('#wm-link-primary-hover').val(entries.shift() || ''); - $('#wm-link-extra-hover').val(entries.join('\n')).off('.wmHovers').on('input.wmHovers change.wmHovers', wmSyncLinkHoverParts); - wmSyncLinkHoverParts(); -} -function wmSetLinkPrimaryHover(value) { - if (!$('#wm-link-extra-hover').length) { - $('#link_hover').val(value); - return; - } - $('#wm-link-primary-hover').val(value); - var ids = wmLocalGraphIds(value, ['graph_image.php']); - var extras = wmLinkHoverEntries($('#wm-link-extra-hover').val()).filter(function(entry) { - return !ids.some(function(id) { return wmLocalGraphIds(entry, ['graph_image.php']).includes(id); }); - }); - $('#wm-link-extra-hover').val(extras.join('\n')); - wmSyncLinkHoverParts(); -} -function wmPromoteLinkTrafficHover(graphId) { - if (!$('#wm-link-extra-hover').length || !/^[1-9][0-9]*$/.test(String(graphId))) return; - var main = $('#wm-link-primary-hover').val(); - var extras = wmLinkHoverEntries($('#wm-link-extra-hover').val()); - if (!main && !extras.length) return; - if (wmLocalGraphIds(main, ['graph_image.php']).includes(String(graphId))) return; - var traffic = extras.find(function(entry) { - return wmLocalGraphIds(entry, ['graph_image.php']).includes(String(graphId)); - }); - if (!traffic) return; - if (main) extras.unshift(main); - $('#wm-link-extra-hover').val(extras.join('\n')); - wmSetLinkPrimaryHover(traffic); - wmRestoreLinkGraphChoice(true); -} -function wmSetLinkExtraHover(value, replace) { - var field = $('#wm-link-extra-hover'); - if (!field.length) field = $('#link_hover'); - var ids = wmLocalGraphIds(value, ['graph_image.php']); - var primary = wmLocalGraphIds($('#wm-link-primary-hover').val() || '', ['graph_image.php']); - if (ids.some(function(id) { return primary.includes(id); })) return; - var entries = replace ? [] : wmLinkHoverEntries(field.val()); - if (!entries.some(function(entry) { - return entry === value || ids.some(function(id) { return wmLocalGraphIds(entry, ['graph_image.php']).includes(id); }); - })) { - if (entries.length >= 1) { - $('#wm-link-hover-status').text(wmEditorText.hoverLimit); - return; - } - entries.push(value); - } - field.val(entries.join('\n')); - wmSyncLinkHoverParts(); -} - -// Compare the effective RRD inputs without conflating custom data sources or scaling. -function wmLinkTrafficIdentity(source) { - var defaults = typeof wmRrdSourceDefaults === 'undefined' ? {} : wmRrdSourceDefaults; - var file = String(source), input = defaults.input || 'traffic_in', output = defaults.output || 'traffic_out', scale = 8, multiplier = 1; - if (file.startsWith('-')) { multiplier = -1; file = file.slice(1); } - var outer = file.match(/^([0-9]+(?:\.[0-9]*)?)\*(.*)$/); - if (outer) { multiplier *= Number(outer[1]); file = outer[2]; } - var ds = file.match(/^(.*\.rrd):([-a-zA-Z0-9_]+):([-a-zA-Z0-9_]+)$/); - if (ds) { file = ds[1]; input = ds[2]; output = ds[3]; } - file = file.replace(/^rrd:/, ''); - if (file.startsWith('gauge:')) { scale = 1; file = file.slice(6); } - if (file.startsWith('scale:')) { - var separator = file.indexOf(':', 6), value = file.slice(6, separator); - if (separator < 0 || !/^[+-]?(?:[0-9]+(?:\.[0-9]*)?|\.[0-9]+)$/.test(value)) return null; - scale = Number(value); - if (!Number.isFinite(scale)) return null; - file = file.slice(separator + 1); - } - if (!/\.rrd$/.test(file)) return null; - if (!/^[/.]/.test(file) && defaults.path) file = defaults.path + '/' + file; - if (!file.startsWith('/') && defaults.rraPath) file = defaults.rraPath + '/' + file; - file = (file.startsWith('/') ? '/' : '') + file.split('/').filter(function(part) { return part !== '' && part !== '.'; }).join('/'); - scale *= multiplier; - if (!Number.isFinite(scale)) return null; - return JSON.stringify([file, input, output, scale]); -} -function wmLinkSameTrafficSource(left, right) { - if (left === right) return true; - var key = wmLinkTrafficIdentity(left); - return key !== null && key === wmLinkTrafficIdentity(right); -} - -function wmRenderLinkTrafficSources() { - var list = $('#wm-link-measured-sources'); - if (!list.length) return; - var entries = wmLinkHoverEntries($('#link_target').val()); - list.empty(); - if (!$('#wm-link-source-count').length) $('').insertAfter('#wm-link-current'); - $('#wm-link-source-count').text(entries.length > 1 ? wmEditorText.combinedSources.replace('%s', String(entries.length)) : ''); - $('#wm-link-rrd').text((entries[0] || '').split('/').pop()); - if (!entries.length) $('').text(wmEditorText.noMeasuredSources).appendTo(list); - entries.forEach(function(source, index) { - var row = $('').appendTo(list); - $('').text(source).appendTo(row); - if (index === 0) { - $('').text(wmEditorText.primarySource).appendTo(row); - return; - } - $('') - .text(wmEditorText.removeSource).attr('aria-label', wmEditorText.removeSource + ': ' + source) - .appendTo(row).on('click', function() { - var current = wmLinkHoverEntries($('#link_target').val()); - if (current.join(' ') !== entries.join(' ')) { wmRenderLinkTrafficSources(); return; } - current.splice(index, 1); - $('#link_target').val(current.join(' ')); - wmRenderLinkTrafficSources(); - $('#wm-link-source-status').text(wmEditorText.sourceRemoved); - var next = list.find('button').eq(Math.min(index - 1, current.length - 2)); - if (next.length) next.trigger('focus'); - else $('#link_target').trigger('focus'); - }); - }); -} - -function wmApplyLinkTrafficSource() { - var entries = wmLinkHoverEntries($('#link_target').val()); - if (!entries.length) { - $('#wm-link-source-status').text(wmEditorText.choosePrimaryFirst); - return; - } - var item = $('#wm-link-source-picker').data('wm-choice'); - if (!item || !item.id || !(item.local_graph_id > 0)) { - $('#wm-link-source-status').text(wmEditorText.chooseSourceFirst); - return; - } - var duplicate = entries.some(function(source) { return wmLinkSameTrafficSource(source, String(item.id)); }); - if (!duplicate) entries.push(String(item.id)); - $('#link_target').val(entries.join(' ')); - wmRenderLinkTrafficSources(); - $('#wm-link-source-status').text(duplicate ? wmEditorText.sourceAlreadyAdded : wmEditorText.sourceAdded); -} -function wmInitLinkSourcePicker(container) { - var picker = $('') - .attr({'aria-label': wmEditorText.chooseSource, placeholder: wmEditorText.searchInterface}).prependTo(container); - var offset = 0, term = '', generation = 0; - var buttons = $('#link_target_picker_add'); - picker.autocomplete({ - minLength: 0, autoFocus: false, - source: function(request, response) { - if (request.term !== term) offset = 0; - term = request.term; - var ticket = ++generation, link = $('#link_name').val(), map = $('#mapname').val(); - $.getJSON(window.location.pathname, {action:'datasources', target:'link_target_picker', mapname:map, graph_template_id:-1, paged:1, offset:offset, term:term}) - .done(function(data) { - if (ticket !== generation || $('#link_name').val() !== link || $('#mapname').val() !== map) return response([]); - var items = data.items.slice(); - if (data.offset > 0) items.unshift({label:data.previous_label, value:term, wmOffset:Math.max(0,data.offset-100)}); - if (data.next_offset != null) items.push({label:data.next_label, value:term, wmOffset:data.next_offset}); - response(items); - }).fail(function() { response([]); }); - }, - focus: function(event, ui) { if (ui.item.wmOffset !== undefined) return false; }, - select: function(event, ui) { - if (ui.item.wmOffset !== undefined) { - offset = ui.item.wmOffset; - setTimeout(function() { picker.autocomplete('search', term); }, 0); - return false; - } - var valid = !!(ui.item.id && ui.item.local_graph_id > 0); - picker.val(valid ? ui.item.label : '').data('wm-choice', valid ? ui.item : null); - buttons.prop('disabled', !valid); - $('#wm-link-source-status').text(valid ? wmEditorText.sourceReady : wmEditorText.chooseSourceFirst); - return false; - } - }); - picker.on('input.wmSource', function() { - picker.removeData('wm-choice'); buttons.prop('disabled', true); $('#wm-link-source-status').text(wmEditorText.chooseSourceFirst); - }).on('focus.wmSource', function() { picker.autocomplete('search', picker.data('wm-choice') ? '' : picker.val()); }); -} - -var wmLinkGraphRestoreGeneration = 0; -function wmRestoreLinkGraphChoice(preserveSelection) { - var picker = $('#link_picker_input'); - if (!picker.length) return; - var ticket = ++wmLinkGraphRestoreGeneration; - var extras = String($('#wm-link-extra-hover').val() || ''), link = $('#link_name').val(); - var automatic = !picker.val() || (String($('#link_picker').val()) === String(picker.data('wm-restored-graph')) && picker.val() === picker.data('wm-restored-label')); - if (!preserveSelection || automatic) { - $('#link_picker').val(''); - picker.val('').removeData('wm-graph-choice').removeData('wm-restored-graph').attr('placeholder', wmEditorText.searchGraph); - } - var selection = picker.val(); - var entries = wmLinkHoverEntries(extras); - var ids = entries.length === 1 ? wmLocalGraphIds(entries[0], ['graph_image.php']) : []; - if (ids.length !== 1) return; - wmGetGraphSummaries(ids).done(function(items) { - if (ticket !== wmLinkGraphRestoreGeneration || $('#link_name').val() !== link || String($('#wm-link-extra-hover').val() || '') !== extras) return; - var item = items.find(function(item) { return String(item.id) === ids[0]; }); - if (!item) return; - if ((!preserveSelection || automatic) && picker.val() === selection) { - $('#link_picker').val(String(item.id)); - picker.val(item.label).data('wm-graph-choice', item).data('wm-restored-graph', String(item.id)).data('wm-restored-label', item.label); - } - var row = $('#wm-link-extra-list .wm-link-extra-item').filter(function() { return $(this).attr('data-hover-url') === entries[0]; }); - row.find('.wm-link-extra-name').text(item.label); - row.find('.wm-link-extra-rrds').text((item.rrds || []).join(', ') || wmEditorText.noGraphRrd); - }); -} - -// Keep advanced link tasks separate without duplicating submitted fields or pickers. -function wmBuildLinkSections() { - var dlg = $('#dlgLinkProperties'); - if ($('#wm-link-sections').length) return; - var body = dlg.find('.dlgBody'); - if (!body.length) body = dlg; - var sections = $('').appendTo(body); - var controls = $('').appendTo(sections); - function group(id, title, fields, hint) { - var panel = $('') - .attr({id:id, 'aria-labelledby':id+'-button'}).appendTo(sections); - $('') - .attr({id:id+'-button', 'aria-controls':id}).text(title).appendTo(controls) - .on('click', function() { - var open = $(this).attr('aria-expanded') !== 'true'; - controls.find('.wm-link-section-toggle').attr('aria-expanded', 'false').removeClass('ui-state-active'); - sections.find('.wm-link-group').prop('hidden', true); - $(this).attr('aria-expanded', String(open)).toggleClass('ui-state-active', open); - panel.prop('hidden', !open); - if (dlg.dialog('instance')) dlg.dialog('option', 'position', {my:'center', at:'center', of:window}); - }); - if (hint) $('').text(hint).appendTo(panel); - var table = $('
').appendTo(panel); - dlg.find(fields).closest('tr').appendTo(table); - return panel; - } - $('#link_labelposmode').on('change.wmPositions', function() { - $('#link_labelposin,#link_labelposout').prop('disabled', $(this).val() !== 'custom'); - }); - var hovers = group('wm-link-hovers', wmEditorText.additionalGraphs, '#link_template,#link_picker'); - dlg.find('.wm-link-section p').addClass('wm-link-group-hint').prependTo(hovers); - dlg.find('.wm-link-section').remove(); - $('').append($('#link_picker_add,#link_picker_rep')).appendTo($('#link_picker').closest('td')); - $('').appendTo($('#link_picker').closest('td')); - $('').appendTo(hovers); - wmRenderLinkExtraGraphs(); - $('#link_target_picker_rep').remove(); - var advanced = group('wm-link-advanced', wmEditorText.advanced, - '#link_labelposmode,#link_target,#link_infourl,#wm-link-primary-hover,#wm-link-extra-hover', wmEditorText.linkAdvancedHint); - $('#link_labelposmode').closest('tr').prependTo(advanced.find('table')); - var sourceRow = $('').insertBefore($('#link_target').closest('tr')); - $('').text(wmEditorText.chooseSource).appendTo(sourceRow); - var sourceActions = $('').appendTo($('').appendTo(sourceRow)) - .append($('#link_target_picker_add')); - wmInitLinkSourcePicker(sourceActions); - $('').text(wmEditorText.trafficSourcesHint).appendTo(sourceActions.parent()); - $('').insertBefore('#link_target'); - $('').attr('aria-label', wmEditorText.trafficSources).insertBefore('#link_target'); - $('#link_target').off('.wmExpert').on('input.wmExpert', function() { - ++wmInterfaceLookupGeneration; - $('#wm-link-current').text(wmEditorText.customInterface); - $('#wm-link-graph').text(wmEditorText.customConfig); - $('#link_target_picker').val('').removeData('wm-choice'); - $('#link_target_picker_input').val(''); - $('#wm-link-use').prop('disabled', true); - wmRenderLinkTrafficSources(); - $('#wm-link-source-status').text(wmEditorText.customSourcesChanged); - }); - $('#link_infourl,#wm-link-primary-hover,#wm-link-extra-hover').off('.wmExpert').on('input.wmExpert change.wmExpert', function() { - ++wmInterfaceLookupGeneration; - wmSyncLinkHoverParts(); - }); - dlg.find('#viastyle,#link_width,#link_commentin,#link_commentout,#link_commentstyle').closest('tr') - .insertAfter($('#link_target_picker').closest('tr')); - $('#link_edit').appendTo(controls); - var help = dlg.find('.dlgHelp').attr('id', 'wm-link-full-help').insertAfter(sections).hide(); - $('') - .attr({'aria-label': wmEditorText.linkHelp, title: wmEditorText.linkHelp}).appendTo(controls) - .on('click', function() { - var open = $(this).attr('aria-expanded') !== 'true'; - $(this).attr('aria-expanded', String(open)); - help.toggle(open); - if (dlg.dialog('instance')) dlg.dialog('option', 'position', {my:'center', at:'center', of:window}); - }); - function hint(id, field, text) { - $('').attr('id', id).text(text).appendTo(dlg.find(field).closest('td')); - var input = dlg.find(field), described = String(input.attr('aria-describedby') || '').split(/\s+/).filter(Boolean); - if (!described.includes(id)) described.push(id); - input.attr('aria-describedby', described.join(' ')); - } - hint('wm-link-bandwidth-hint', '#link_bandwidth_in', wmEditorText.bandwidthHint); - hint('wm-link-comments-hint', '#link_commentout', wmEditorText.commentsHint); - hint('wm-link-destination-hint', '#link_infourl', wmEditorText.clickDestinationHint); - hint('wm-link-extra-url-hint', '#wm-link-extra-hover', wmEditorText.extraUrlsHint); -} - -function compactLinkEditorBase() { - wmInitLinkHoverParts(); - var dlg = $('#dlgLinkProperties'), - table = $('#link_bandwidth_in').closest('table'); - wmBuildLinkSections(); - wmRenderLinkTrafficSources(); - wmRestoreLinkGraphChoice(); - $('#wm-link-source-status').text(wmEditorText.chooseSourceFirst); - $('#wm-link-source-picker').val('').removeData('wm-choice'); - $('#link_target_picker_add').prop('disabled', true); - $('#wm-link-full-help').hide(); - $('#wm-link-help-button').attr('aria-expanded', 'false'); - $('#wm-link-primary-hover').prop('readonly', false).next('small').text(wmEditorText.trafficHoverHint); - if (!$('#wm-link-summary').length) { - $( - '' - ).prependTo(table).find('td:first').text(wmEditorText.currentInterface); - $( - '' - ) - .text(wmEditorText.useInterface) - .appendTo($('#link_target_picker').closest('td')) - .on('click', function () { - var item = $('#link_target_picker').data('wm-choice'); - if (!item || !item.id || !(item.local_graph_id > 0)) return; - ++wmInterfaceLookupGeneration; - var extras = wmLinkHoverEntries($('#link_target').val()).slice(1).filter(function(source) { return !wmLinkSameTrafficSource(source, String(item.id)); }); - $('#link_target').val([String(item.id)].concat(extras).join(' ')); - wmRenderLinkTrafficSources(); - var destination = new URL(infoUrlTarget + item.local_graph_id, new URL('../../', window.location.href)); - $('#link_infourl').val(destination.pathname + destination.search + destination.hash); - wmSetLinkPrimaryHover( - new URL('../../', window.location.href).pathname + - 'graph_image.php?local_graph_id=' + - item.local_graph_id + - '&rra_id=0&graph_nolegend=true&graph_height=100&graph_width=300' - ); - $('#wm-link-current').text(item.label); - $('#wm-link-graph').text( - wmEditorText.graphSelected.replace('%s', String(item.local_graph_id)) - ); - $(this).prop('disabled', true); - }); - } - $('#wm-link-graph').prependTo('#wm-link-advanced'); - wmRenderLinkTrafficSources(); - $('#wm-link-sections').show().find('.wm-link-group').prop('hidden', true); - $('#wm-link-sections .wm-link-section-toggle').attr('aria-expanded', 'false').removeClass('ui-state-active'); - $('#link_edit').show(); - $('#link_target_picker_add').show(); - $('#link_target_picker').closest('tr').find('td:first').text(wmEditorText.changeInterface); - $('#link_target_picker_input').val('').attr('placeholder', wmEditorText.searchInterface); - $('#link_target_picker').val('').removeData('wm-choice'); - local_graph_id = 0; - $('#wm-link-use').prop('disabled', true); - var picker = $('#link_target_picker_input'); - if (!picker.data('wm-compact-hook')) { - var original = picker.autocomplete('option', 'select'); - picker - .autocomplete('option', 'select', function (event, ui) { - if (original && original.call(this, event, ui) === false) return false; - var valid = !!(ui.item.id && ui.item.local_graph_id > 0); - $('#link_target_picker').val(valid ? ui.item.id : '').data('wm-choice', valid ? ui.item : null); - local_graph_id = valid ? ui.item.local_graph_id : 0; - $('#wm-link-use').prop('disabled', !valid); - }) - .on('input.wmCompact', function () { - $('#link_target_picker').val('').removeData('wm-choice'); - local_graph_id = 0; - $('#wm-link-use').prop('disabled', true); - }); - picker.data('wm-compact-hook', true); - } - var target = String($('#link_target').val() || '').trim(); - $('#wm-link-current').text(target ? target.split('/').pop() : wmEditorText.noInterface); - var ids = String($('#link_infourl').val() || '').match(/(?:local_graph_id|graph_list)=([0-9,]+)/); - $('#wm-link-graph').text( - ids - ? wmEditorText.currentGraph.replace('%s', ids[1]) - : target - ? wmEditorText.customConfig - : wmEditorText.chooseInterface - ); - $('#link_bandwidth_in') - .closest('tr') - .find('td:first') - .text(wmEditorText.bandwidthIn.replace('%s', function() { return $('#link_nodename1').text(); })); - $('#link_bandwidth_out') - .closest('tr') - .find('td:first') - .text(wmEditorText.bandwidthOut.replace('%s', function() { return $('#link_nodename1').text(); })); -} - -var wmInterfaceSummaries = {}; -var wmInterfaceLookupGeneration = 0; -function wmGetInterfaceSummary(graphIds) { - var key = $('#mapname').val() + ':' + graphIds.join(','); - if (!wmInterfaceSummaries[key]) { - wmInterfaceSummaries[key] = $.getJSON(window.location.pathname, { - action: 'datasources', - term: '', - mapname: $('#mapname').val(), - target: 'link_target_picker', - graph_template_id: -1, - paged: 1, - graph_ids: graphIds.join(',') - }); - wmInterfaceSummaries[key].fail(function () { - delete wmInterfaceSummaries[key]; - }); - } - return wmInterfaceSummaries[key]; -} -function wmGetInterfaceCandidates(graphIds) { - var result = $.Deferred(); - var unique = Array.from(new Set(graphIds)); - var items = []; - var successes = 0; - function next(offset) { - if (offset >= unique.length) { - if (successes || !unique.length) result.resolve({items: items}); - else result.reject(); - return; - } - wmGetInterfaceSummary(unique.slice(offset, offset + 100)).done(function(data) { - items = items.concat(data.items); - successes++; - }).always(function() { next(offset + 100); }); - } - next(0); - return result.promise(); -} -function compactLinkEditor() { - var generation = ++wmInterfaceLookupGeneration; - compactLinkEditorBase(); - var dlg = $('#dlgLinkProperties'); - if (!$('#wm-link-rrd').length) - $('').insertAfter( - '#wm-link-current' - ); - - var buttons = dlg.find('.dlgSubButtons'); - $('#tb_link_submit').prependTo(buttons).css({ 'font-weight': 'bold' }); - $('#tb_link_cancel').insertAfter('#tb_link_submit'); - if (!$('#wm-link-delete-bar').length) - $('').insertBefore( - $('#link_nodename1').parent() - ); - $('#link_delete').appendTo('#wm-link-delete-bar').css({ 'margin-left': '0', color: '#9b2525' }); - $('#link_tidy').show().insertBefore('#tb_link_submit'); - $('#link_via').show().insertAfter('#link_tidy').css('margin-right', '24px'); - var picker = $('#link_target_picker_input'); - picker.attr('placeholder', wmEditorText.browseInterface); - picker.autocomplete('option', 'autoFocus', false); - $('#link_target_picker_wrap').off('click dblclick mouseleave'); - picker.off('click.wmReopen').on('click.wmReopen', function () { - picker.autocomplete('search', ''); - }); - $('#link_target_picker_click') - .off('click.wmReopen') - .on('click.wmReopen', function () { - picker.trigger('focus'); - picker.autocomplete('search', ''); - }); - if (!$('#wm-link-browse').length) - $('') - .text(wmEditorText.browseAll) - .insertAfter('#wm-link-use') - .on('click', function () { - picker.trigger('focus'); - picker.autocomplete('search', ''); - }); - if (!$('#wm-link-apply-hint').length) - $('
').insertBefore(table); - $('#node_delete').text(wmEditorText.deleteNode).appendTo('#wm-node-delete-bar').css('color', '#9b2525'); - var buttons = dlg.find('.dlgSubButtons'); - $('#node_move').prependTo(buttons); - $('#node_clone').insertAfter('#node_move').css('margin-right', '24px'); - $('#tb_node_submit').insertAfter('#node_clone').css('font-weight', 'bold'); - $('#tb_node_cancel').insertAfter('#tb_node_submit'); - if (!$('#wm-node-toggle').length) { - $('') - .text(wmEditorText.advanced) - .insertBefore(dlg.find('.dlgButtons')) - .on('click', function () { - var open = $(this).attr('aria-expanded') !== 'true'; - $(this) - .attr('aria-expanded', String(open)) - .text(open ? wmEditorText.hideAdvanced : wmEditorText.advanced); - rows.toggle(open); - dlg.find('#node_edit,.dlgHelp').toggle(open); - }); - $( - '
' - ).text(wmEditorText.nodePurpose).insertAfter('#wm-node-toggle'); - dlg.find('.dlgHelp').empty().append( - $('

').text(wmEditorText.nodeDisplayHelp), - $('

').text(wmEditorText.nodeHoverHelp), - $('

').text(wmEditorText.nodeAdvancedHelp) - ); - } - rows.hide(); - dlg.find('#node_edit,.dlgHelp').hide(); - $('#wm-node-toggle').attr('aria-expanded', 'false').text(wmEditorText.advanced); -} - -function refineNodePicker() { - var picker = $('#node_picker_input'), - buttons = $('#node_picker_add,#node_picker_rep'); - picker.val('').attr('placeholder', wmEditorText.searchGraph); - $('#node_picker').val(''); - buttons.prop('disabled', true); - picker.autocomplete('option', 'autoFocus', false); - $('#node_picker_wrap').off('click dblclick mouseleave'); - picker.off('click.wmNode').on('click.wmNode', function () { - picker.autocomplete('search', ''); - }); - $('#node_picker_click') - .off('click.wmNode') - .on('click.wmNode', function () { - picker.trigger('focus'); - picker.autocomplete('search', ''); - }); - if (!picker.data('wm-node-hook')) { - var original = picker.autocomplete('option', 'select'); - picker.autocomplete('option', 'select', function (event, ui) { - if (original && original.call(this, event, ui) === false) return false; - buttons.prop('disabled', !ui.item.id); - }); - picker.on('input.wmNode', function () { - buttons.prop('disabled', true); - }); - picker.data('wm-node-hook', true); - } - if (!$('#wm-node-browse').length) - $('') - .text(wmEditorText.browseAll) - .appendTo($('#node_picker').closest('td')) - .on('click', function () { - picker.trigger('focus'); - picker.autocomplete('search', ''); - }); - if (!$('#wm-node-graphs').length) - $('

').insertBefore('#wm-node-toggle'); - var hover = String($('#node_hover').val() || ''); - var matches = []; - hover.trim().split(/\s+/).forEach(function(entry) { - matches = matches.concat(wmLocalGraphIds(entry, ['graph_image.php'])); - }); - $('#wm-node-graphs').text(wmNodeHoverSummary(hover, [])); - if (matches.length) - wmGetGraphSummaries(matches).done(function (items) { - if (String($('#node_hover').val() || '') !== hover) return; - var labels = items.filter(function (i) { - return matches.indexOf(String(i.id)) !== -1; - }); - $('#wm-node-graphs').text(wmNodeHoverSummary(hover, labels)); - if (labels.length === 1 && !picker.val()) picker.val(labels[0].label); - }); -} -// Only IDs from this installation's known graph endpoints are local candidates. -function wmLocalGraphIds(value, endpoints) { - try { - var root = new URL('../../', window.location.href); - var url = new URL(value, /^graph(?:_image|_view)?\.php(?:[?#]|$)/.test(value) ? root : window.location.href); - if (url.origin !== root.origin || !endpoints.some(function(endpoint) { return url.pathname === root.pathname + endpoint; })) return []; - var ids = url.searchParams.get(url.pathname.endsWith('/graph_view.php') ? 'graph_list' : 'local_graph_id'); - return ids && /^[0-9]+(?:,[0-9]+)*$/.test(ids) ? ids.split(',') : []; - } catch (error) { - return []; - } -} -function wmNodeHoverSummary(hover, items) { - var entries = hover.trim().split(/\s+/).filter(Boolean); - if (!entries.length) return wmEditorText.noHover; - var labels = new Map(items.map(function(item) { return [String(item.id), item.label]; })); - var summary = entries.map(function(entry) { - var graph = wmLocalGraphIds(entry, ['graph_image.php']); - return graph.length ? (labels.get(graph[0]) || wmEditorText.unavailableGraph) : wmEditorText.customImages; - }); - return wmEditorText.hoverSummary.replace('%s', function() { return summary.join('; '); }); -} -function wmGetGraphSummaries(ids) { - var result = $.Deferred(); - var unique = Array.from(new Set(ids)); - var labels = []; - function next(offset) { - if (offset >= unique.length) { - result.resolve(labels); - return; - } - $.getJSON(window.location.pathname, { - action: 'graphs', term: '', mapname: $('#mapname').val(), - target: 'node_picker', graph_template_id: -1, paged: 1, include_rrds: '1', - graph_ids: unique.slice(offset, offset + 100).join(',') - }).done(function(data) { - labels = labels.concat(data.items); - next(offset + 100); - }).fail(function() { result.reject(); }); - } - next(0); - return result.promise(); -} -function wmNodeDisplayName(name) { - var node = Nodes[name]; - var label = node ? String(node.label || '').trim() : ''; - return label && label !== 'Node' ? label.replace(/\\n/g, ' ').replace(/\s+/g, ' ') : name; -} -function wmFriendlyLinkNames() { - var link = Links[$('#link_name').val()]; - if (!link) return; - $('#link_nodename1').text(wmNodeDisplayName(link.a)); - $('#link_nodename2').text(wmNodeDisplayName(link.b)); - $('#link_bandwidth_in') - .closest('tr') - .find('td:first') - .text(wmEditorText.bandwidthIn.replace('%s', function() { return wmNodeDisplayName(link.a); })); - $('#link_bandwidth_out') - .closest('tr') - .find('td:first') - .text(wmEditorText.bandwidthOut.replace('%s', function() { return wmNodeDisplayName(link.a); })); - if (!$('#wm-link-internal-id').length) - $('').insertBefore( - $('#wm-link-advanced').find('table') - ); - $('#wm-link-internal-id') - .text(wmEditorText.internalLink.replace('%s', function() { return link.name; })); - -} - // Map JavaScript HTML-escapes URL values; undo that when populating text fields. function wmDecodeEditorUrl(value) { return String(value || '').replace(/&/g, '&'); } -function wmAssetRequest(action, extra, callback, errorId) { - var values = {action: action, mapname: $('#mapname').val()}; - if (action !== 'image_data' && typeof WMConfigRevision !== 'undefined') values.config_revision = WMConfigRevision; - if (typeof csrfMagicToken !== 'undefined') values.__csrf_magic = csrfMagicToken; - $.ajax({url: editor_url, type: action === 'image_data' ? 'GET' : 'POST', dataType: 'json', data: $.extend(values, extra), - success: callback, error: function(xhr) { $('#' + errorId).text(xhr.responseJSON && xhr.responseJSON.error || wmEditorText.imageText3); }}); -} -function wmAssetImages(images) { - $('#wm-images-objects, #wm-images-backgrounds').empty(); - images.forEach(function(item) { - var card = $('
').appendTo('#wm-images-' + item.kind); - var src = wmEditorImageSrc(item.url); - if (src) { - var image = document.createElement('img'); - image.src = src; - image.alt = item.name; - image.loading = 'lazy'; - card.append(image); - } - $('').text(item.name).appendTo(card); - if (item.width && item.height) $('').text(item.width + ' × ' + item.height + ' px').appendTo(card); - $('').text(item.users && item.users.length ? wmEditorText.imageUsed.replace('%s', item.users.join(', ')) : wmEditorText.imageUnused).appendTo(card); - if (item.deletable !== false) $(' "; + if (id !== 'link_target_picker') dialogForm += ""; + + $(this).after(dialogForm); + $(this).hide(); + $('#' + id + '_add').text($(this).attr('data-add-label') || 'Add'); + $('#' + id + '_rep').text($(this).attr('data-replace-label') || 'Replace'); + $('#' + id + '_input').attr('aria-label', $(this).attr('aria-label') || $(this).closest('tr').find('td:first').text()); + + $('#' + id + '_add').off('click').on('click', function() { + var hover = 'graph_image.php?local_graph_id=';; + var infourl = infoUrlTarget; + + if (id == 'link_target_picker') { + wmApplyLinkTrafficSource(); + } else { + var hover = 'graph_image.php?local_graph_id=';; + var infourl = infoUrlTarget; + + if (id == 'link_picker') { + var target = String($('#' + id).val() || ''); + if (!/^[1-9][0-9]*$/.test(target)) return; + var graphUrl = new URL(hover + target, new URL('../../', window.location.href)); + wmSetLinkExtraHover(wmLinkCompactHoverUrl(graphUrl.pathname + graphUrl.search), false); + } else if (id == 'node_picker') { + var target = $('#' + id).val(); + var ehover = $('#node_hover').val(); + var einfo = $('#node_infourl').val(); + + if (einfo == '') { + einfo = infourl; + } + + $('#node_hover').val(ehover + (ehover != '' ? ' ':'') + hover + target); + + if (infoUrlStyle == 0) { + $('#node_infourl').val(einfo + (einfo != '' ? ',':'') + target); + } else { + $('#node_infourl').val(infourl + target); + } + } + } + }); + + $('#' + id + '_rep').off('click').on('click', function() { + if (id == 'link_picker') { + var target = String($('#' + id).val() || ''); + if (!/^[1-9][0-9]*$/.test(target)) return; + var graphUrl = new URL('graph_image.php?local_graph_id=' + target, new URL('../../', window.location.href)); + wmSetLinkExtraHover(wmLinkCompactHoverUrl(graphUrl.pathname + graphUrl.search), true); + } else if (id == 'node_picker') { + $('#node_hover').val('graph_image.php?local_graph_id=' + $('#' + id).val()); + $('#node_infourl').val(infoUrlTarget + $('#' + id).val()); + } + }); + + $('#' + id + '_input').autocomplete({ + source: function(request, response) { + if (id == 'node_picker') { + var template = $('#node_template').val(); + } else if (id == 'link_picker') { + var template = $('#link_template').val(); + } else { + var template = -1; + } + + if (request.term !== pickerTerm || template !== pickerTemplate) { + pickerOffset = 0; + } + pickerTerm = request.term; + pickerTemplate = template; + + var url = 'weathermap-cacti-plugin-editor.php' + + '?mapname=' + encodeURIComponent($('#mapname').val()) + + '&action=' + action + + '&term=' + encodeURIComponent(request.term) + + '&target=' + id + + '&graph_template_id='+template + '&paged=1&include_rrds=' + (id === 'link_picker' ? '1' : '0') + '&offset=' + pickerOffset; + + $.getJSON(url, function(data) { + var items = data.items; + if (data.offset > 0) { + items.unshift({label: data.previous_label, value: request.term, wmOffset: Math.max(0, data.offset - 100)}); + } + if (data.next_offset !== null) { + items.push({label: data.next_label, value: request.term, wmOffset: data.next_offset}); + } + response(items); + }).fail(function() { response([]); }); + }, + autoFocus: false, + minLength: 0, + focus: function(event, ui) { + if (ui.item.wmOffset !== undefined) { return false; } + }, + select: function(event, ui) { + if (ui.item.wmOffset !== undefined) { + pickerOffset = ui.item.wmOffset; + setTimeout(function() { $('#' + id + '_input').autocomplete('search', pickerTerm); }, 0); + return false; + } + $('#' + id + '_input').val(ui.item.label); + if (id === 'link_picker') $(this).data('wm-graph-choice', ui.item); + + if (ui.item.id) { + $('#' + id).val(ui.item.id); + local_graph_id = ui.item.local_graph_id; + } else { + $('#' + id).val(ui.item.value); + local_graph_id = ui.item.local_graph_id; + } + }, + open: function(event, ui) { + $('.ui-dialog').css('z-index', '20'); + $(this).css('z-index', '5000'); + } + }).css('border', 'none').css('background-color', 'transparent'); + + $('#' + id + '_wrap').on('dblclick', function() { + graphOpen = false; + clearTimeout(graphTimer); + clearTimeout(graphClickTimer); + $('#' + id + '_input').autocomplete('close').select(); + }).on('click', function() { + if (graphOpen) { + $('#'+'_input').autocomplete('close'); + clearTimeout(graphTimer); + graphOpen = false; + } else { + graphClickTimer = setTimeout(function() { + pickerOffset = 0; + $('#' + id + '_input').autocomplete('search', ''); + clearTimeout(graphTimer); + graphOpen = true; + }, 200); + } + $('#' + id + '_input').select(); + }).on('mouseleave', function() { + graphTimer = setTimeout(function() { $('#' + id + '_input').autocomplete('close'); }, 800); + }); + + var width = $('#' + id + '_input').textBoxWidth(); + if (width < 200) { + width = 200; + } + + $('#' + id + '_wrap').css('width', width+20); + $('#' + id + '_input').css('width', width); + $('#' + id + '_wrap').find('.ui-select-text').css('width', width); + + $('ul[id^="ui-id"]').on('mouseenter', function() { + clearTimeout(graphTimer); + }).on('mouseleave', function() { + graphTimer = setTimeout(function() { + $('#' + id + '_input').autocomplete('close'); + }, 800); + }); + + $('ul[id^="ui-id"] > li').on('mouseenter', function() { + $(this).addClass('ui-state-hover'); + }).on('mouseleave', function() { + $(this).removeClass('ui-state-hover'); + }); + + $('#' + id + '_wrap').on('mouseenter', function() { + $(this).addClass('ui-state-hover'); + $('input#' + id + '_input').addClass('ui-state-hover'); + }).on('mouseleave', function() { + $(this).removeClass('ui-state-hover'); + $('input#' + id + '_input').removeClass('ui-state-hover'); + }); + }); +} +/* Return an absolute preview URL for a relative path inside the plugin's + * images/ tree, or '' for anything else. URL parsing resolves dot segments + * (including percent-encoded ones) before the prefix check, so traversal out + * of images/ and other origins or schemes are rejected. */ +function wmEditorImageSrc(value) { + if (typeof value !== 'string' || !/^images\/[^?#\\]+\.(png|gif|jpe?g)$/i.test(value)) return ''; + try { + var image = new URL(value, document.baseURI); + var root = new URL('images/', document.baseURI); + return image.origin === root.origin && image.pathname.indexOf(root.pathname) === 0 ? image.href : ''; + } catch (error) { + return ''; + } +} + +function wmNodeIconPicker() { + var select = $('#node_iconfilename'); + if (select.hasClass('dd-container')) { + select.ddslick('destroy'); + select = $('#node_iconfilename'); + } + select.val(selectedNode).addClass('wm-icon-source'); + $('#wm-icon-picker').remove(); + var picker = $('
').insertAfter(select); + var summary = $('').appendTo(picker); + var panel = $('
').appendTo(picker); + var search = $('').attr({placeholder: wmEditorText.iconSearchPlaceholder, 'aria-label': wmEditorText.iconSearchLabel}).appendTo(panel); + var count = $('
').appendTo(panel); + var grid = $('
').attr({role: 'group', 'aria-label': wmEditorText.iconGroupLabel}).appendTo(panel); + function title(option) { + return option.text.replace(/\.(png|gif|jpe?g)$/i, '').replace(/[-_]+/g, ' '); + } + function content(target, option) { + var src = wmEditorImageSrc($(option).attr('data-imagesrc')); + if (src) { + var image = document.createElement('img'); + image.alt = ''; + image.src = src; + target.append(image); + } + $('').text(title(option)).appendTo(target); + } + function updateSelection() { + var option = select.find('option:selected')[0]; + summary.empty(); + if (option) content(summary, option); + else summary.text(wmEditorText.iconChoosePrompt); + grid.find('button').each(function() { + $(this).attr('aria-pressed', String($(this).data('value') === select.val())); + }); + } + select.find('option').each(function() { + var option = this; + var button = $('
',{runScripts:'outside-only',pretendToBeVisual:true}); const w=dom.window,$=jquery(w);w.$=w.jQuery=$; w.eval(fs.readFileSync(path.join(process.env.CACTI_JS_DIR,'jquery-ui.js'),'utf8')); -const source=fs.readFileSync(path.join(__dirname,'../../js/editor.js'),'utf8'); -w.eval(source.slice(source.indexOf('function cancel_op('),source.indexOf('function help_handler('))); -w.eval(source.slice(source.indexOf('function show_itemtext('),source.indexOf('function prime_node_form('))); -w.eval(source.slice(source.indexOf('function show_dialog('),source.indexOf('function coord_capture('))); +const {loadEditorScripts}=require('./editorScripts.cjs'); +loadEditorScripts(w,['editor.js','editor.dialogs.js']); w.mapmode=()=>{};w.wmResetActionHelp=()=>{};w.editor_url='/editor';$.ajax=()=>{}; $('#tb_textedit_cancel').on('click',w.cancel_op); for(const [type,parent,action,edit] of [['link','dlgLinkProperties','set_link_properties','link_edit'],['node','dlgNodeProperties','set_node_properties','node_edit']]){ diff --git a/tests/Browser/EditorColoursTest.cjs b/tests/Browser/EditorColoursTest.cjs index 388abbdf..fc3f0098 100644 --- a/tests/Browser/EditorColoursTest.cjs +++ b/tests/Browser/EditorColoursTest.cjs @@ -1,9 +1,10 @@ // Exercise real preset rendering, named-scale preservation, Custom and save payloads. -const {JSDOM}=require('jsdom'),jquery=require('jquery'),fs=require('node:fs'),path=require('node:path'),assert=require('node:assert/strict'); +const {JSDOM}=require('jsdom'),jquery=require('jquery'),assert=require('node:assert/strict'); const dom=new JSDOM('
',{runScripts:'outside-only',pretendToBeVisual:true}); const w=dom.window,$=jquery(w);w.$=w.jQuery=$;w.editor_url='/editor';w.csrfMagicToken='fixture';$.fn.dialog=function(){return this;};$.fn.selectmenu=function(command){return command==='instance'?undefined:this;}; w.wmEditorText={rangeScale:'Échelle',rangeFrom:'Début',rangeTo:'Fin',rangeLabel:'Libellé',backgroundColour:'Map background',borderColour:'Link border',rangeColour:'Range colour',gradientColour:'Gradient end',palette:{Black:'Black',White:'White',Blue:'Bleu',Red:'Red',Green:'Green',Purple:'Purple',Orange:'Orange',Grey:'Grey',None:'None'},colourText0:'No gradient',colourText1:'Custom colour',colourText2:'Remove',colourText3:'No ranges',colourText4:'Save failed',colourText7:'Remove range',colourText8:'Custom %s'}; -const source=fs.readFileSync(path.join(__dirname,'../../js/editor.js'),'utf8');w.eval(source.slice(source.indexOf('var wmAssetPalette'))); +const {loadEditorScripts}=require('./editorScripts.cjs'); +loadEditorScripts(w,['editor.js','editor.assets.js']);w.editor_url='/editor'; Object.keys(w.wmTrafficPresets).concat('custom').forEach(key=>$('#wm-traffic-preset').append($('