diff options
author | Alexander Shubin <aleksandrs.subins@zabbix.com> | 2021-12-15 17:28:14 +0300 |
---|---|---|
committer | Alexander Shubin <aleksandrs.subins@zabbix.com> | 2021-12-15 17:28:14 +0300 |
commit | 578ea02992e29f0ec84f87d8fd9f003a4253df61 (patch) | |
tree | 3814223674fb8c53b931f4a5aba0ec71c3227b7f | |
parent | 3576258e710edfc1efc3c63cf6531f4d43e86378 (diff) |
..F....... [DEV-2027] fixed js code after jquery update
-rw-r--r-- | ui/app/views/js/administration.token.edit.js.php | 2 | ||||
-rw-r--r-- | ui/app/views/js/administration.user.token.edit.js.php | 2 | ||||
-rw-r--r-- | ui/app/views/js/monitoring.charts.view.js.php | 8 | ||||
-rw-r--r-- | ui/app/views/js/popup.mediatypetest.edit.js.php | 8 | ||||
-rw-r--r-- | ui/app/views/js/popup.scriptexec.js.php | 8 | ||||
-rw-r--r-- | ui/include/views/js/configuration.action.edit.js.php | 2 | ||||
-rw-r--r-- | ui/include/views/js/configuration.graph.edit.js.php | 4 | ||||
-rw-r--r-- | ui/include/views/js/configuration.host.edit.js.php | 2 | ||||
-rw-r--r-- | ui/js/class.cmap.js | 6 | ||||
-rw-r--r-- | ui/js/class.coverride.js | 12 | ||||
-rw-r--r-- | ui/js/class.crangecontrol.js | 12 | ||||
-rw-r--r-- | ui/js/class.csvggraph.js | 20 | ||||
-rw-r--r-- | ui/js/colorpicker.js | 10 | ||||
-rw-r--r-- | ui/js/flickerfreescreen.js | 2 | ||||
-rw-r--r-- | ui/js/functions.js | 2 | ||||
-rw-r--r-- | ui/js/gtlc.js | 8 | ||||
-rw-r--r-- | ui/js/main.js | 4 | ||||
-rwxr-xr-x | ui/js/widgets/class.widget.navtree.js | 2 |
18 files changed, 57 insertions, 57 deletions
diff --git a/ui/app/views/js/administration.token.edit.js.php b/ui/app/views/js/administration.token.edit.js.php index ee0a4c12ed7..7cba73469ea 100644 --- a/ui/app/views/js/administration.token.edit.js.php +++ b/ui/app/views/js/administration.token.edit.js.php @@ -41,7 +41,7 @@ $('#regenerate').on('click', ({target}) => { if (confirm($(target).data('confirmation'))) { - $form.append($('<input />', {type: 'hidden', name: 'regenerate', value: '1'})); + $form.append($('<input>', {type: 'hidden', name: 'regenerate', value: '1'})); $form.find('#action_dst').val('token.view'); $form.submit(); } diff --git a/ui/app/views/js/administration.user.token.edit.js.php b/ui/app/views/js/administration.user.token.edit.js.php index 329768e18d7..9afa8b9971c 100644 --- a/ui/app/views/js/administration.user.token.edit.js.php +++ b/ui/app/views/js/administration.user.token.edit.js.php @@ -41,7 +41,7 @@ $('#regenerate').on('click', ({target}) => { if (confirm($(target).data('confirmation'))) { - $form.append($('<input />', {type: 'hidden', name: 'regenerate', value: '1'})); + $form.append($('<input>', {type: 'hidden', name: 'regenerate', value: '1'})); $form.find('#action_dst').val('user.token.view'); $form.submit(); } diff --git a/ui/app/views/js/monitoring.charts.view.js.php b/ui/app/views/js/monitoring.charts.view.js.php index 4c71b248d84..0e6c7a29484 100644 --- a/ui/app/views/js/monitoring.charts.view.js.php +++ b/ui/app/views/js/monitoring.charts.view.js.php @@ -36,10 +36,10 @@ */ var data = JSON.parse('<?= json_encode($data) ?>'), $table = $('#charts'), - $tmpl_row = $('<tr />').append( - $('<div />', {class: 'flickerfreescreen'}).append( - $('<div />', {class: '<?= ZBX_STYLE_CENTER ?>', style: 'min-height: 100px;'}).append( - $('<img />') + $tmpl_row = $('<tr>').append( + $('<div>', {class: 'flickerfreescreen'}).append( + $('<div>', {class: '<?= ZBX_STYLE_CENTER ?>', style: 'min-height: 100px;'}).append( + $('<img>') ) ) ); diff --git a/ui/app/views/js/popup.mediatypetest.edit.js.php b/ui/app/views/js/popup.mediatypetest.edit.js.php index bc698de3b0a..45424653b09 100644 --- a/ui/app/views/js/popup.mediatypetest.edit.js.php +++ b/ui/app/views/js/popup.mediatypetest.edit.js.php @@ -92,13 +92,13 @@ function openLogPopup(opener) { } var debug = JSON.parse(sessionStorage.getItem('mediatypetest')||'null'), - $content = $('<div/>'), - $logitems = $('<div/>', {class: 'logitems'}), - $footer = $('<div/>', {class: 'logtotalms'}); + $content = $('<div>'), + $logitems = $('<div>', {class: 'logitems'}), + $footer = $('<div>', {class: 'logtotalms'}); if (debug) { debug.log.forEach(function (entry) { - $('<pre/>').text(entry.ms + ' ' + entry.level + ' ' + entry.message).appendTo($logitems); + $('<pre>').text(entry.ms + ' ' + entry.level + ' ' + entry.message).appendTo($logitems); }); $footer.text(<?= json_encode(_('Time elapsed:')) ?> + " " + debug.ms + 'ms'); $content.append($logitems); diff --git a/ui/app/views/js/popup.scriptexec.js.php b/ui/app/views/js/popup.scriptexec.js.php index be2f3bafa27..f3c705eccd1 100644 --- a/ui/app/views/js/popup.scriptexec.js.php +++ b/ui/app/views/js/popup.scriptexec.js.php @@ -31,12 +31,12 @@ $(document).ready(function() { } let debug = JSON.parse($('#debug').val()), - $content = $('<div/>'), - $logitems = $('<div/>', {class: 'logitems'}), - $footer = $('<div/>', {class: 'logtotalms'}); + $content = $('<div>'), + $logitems = $('<div>', {class: 'logitems'}), + $footer = $('<div>', {class: 'logtotalms'}); debug.logs.forEach(function (entry) { - $('<pre/>') + $('<pre>') .text(entry.ms + ' ' + entry.level + ' ' + entry.message) .appendTo($logitems); }); diff --git a/ui/include/views/js/configuration.action.edit.js.php b/ui/include/views/js/configuration.action.edit.js.php index eb1d0e7805e..e55dd04ea01 100644 --- a/ui/include/views/js/configuration.action.edit.js.php +++ b/ui/include/views/js/configuration.action.edit.js.php @@ -624,7 +624,7 @@ OperationViewType.prototype.setConfig = function(conf) { const {options, selected} = conf; if (options.length == 1) { - const $hidden_input = $('<input />', {type: 'hidden', name: this.$select.attr('name'), value: selected}); + const $hidden_input = $('<input>', {type: 'hidden', name: this.$select.attr('name'), value: selected}); this.$select.replaceWith([options[0].name, $hidden_input]); } else { diff --git a/ui/include/views/js/configuration.graph.edit.js.php b/ui/include/views/js/configuration.graph.edit.js.php index 6eec623f43e..af5f35b142a 100644 --- a/ui/include/views/js/configuration.graph.edit.js.php +++ b/ui/include/views/js/configuration.graph.edit.js.php @@ -591,7 +591,7 @@ preview_chart.append($('<div>', {css: {'position': 'relative', 'min-height': '50px'}}) .addClass('is-loading')); - $('<img />') + $('<img>') .attr('src', src.getUrl()) .on('load', function() { preview_chart.html($(this)); @@ -673,7 +673,7 @@ item.sortorder = i + 1; - $form.append($('<input />', { + $form.append($('<input>', { type: 'hidden', name: 'items[' + i + ']', value: JSON.stringify(item) diff --git a/ui/include/views/js/configuration.host.edit.js.php b/ui/include/views/js/configuration.host.edit.js.php index 6fdc60ed68d..871e7b0ba7d 100644 --- a/ui/include/views/js/configuration.host.edit.js.php +++ b/ui/include/views/js/configuration.host.edit.js.php @@ -179,7 +179,7 @@ }; this.allow_empty_message = true; - this.$noInterfacesMsg = jQuery('<div class="<?= ZBX_STYLE_GREY ?>"></div>') + this.$noInterfacesMsg = jQuery('<div>', {class: <?= ZBX_STYLE_GREY ?>}) .text('<?= _('No interfaces are defined.') ?>') .addClass('<?= ZBX_STYLE_GREY ?>') .css('padding', '5px 0px') diff --git a/ui/js/class.cmap.js b/ui/js/class.cmap.js index 9bc5cc4f9a2..2ed93f75362 100644 --- a/ui/js/class.cmap.js +++ b/ui/js/class.cmap.js @@ -982,7 +982,7 @@ ZABBIX.apps.map = (function($) { * @return {object} */ dragGroupPlaceholder: function() { - return $('<div/>').css({ + return $('<div>').css({ width: $(this.domNode).width(), height: $(this.domNode).height() }); @@ -1704,7 +1704,7 @@ ZABBIX.apps.map = (function($) { this.sysmap.data.shapes[this.id] = this.data; // create dom - this.domNode = $('<div></div>', { + this.domNode = $('<div>', { style: 'position: absolute; z-index: 1;\ background: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7") 0 0 repeat', }) @@ -2210,7 +2210,7 @@ ZABBIX.apps.map = (function($) { this.sysmap.data.selements[this.id] = this.data; // create dom - this.domNode = $('<div></div>', {style: 'position: absolute; z-index: 100'}) + this.domNode = $('<div>', {style: 'position: absolute; z-index: 100'}) .appendTo(this.sysmap.container) .addClass('cursor-pointer sysmap_element') .attr('data-id', this.id) diff --git a/ui/js/class.coverride.js b/ui/js/class.coverride.js index d45ae49c00c..2aa834f9f74 100644 --- a/ui/js/class.coverride.js +++ b/ui/js/class.coverride.js @@ -26,7 +26,7 @@ jQuery(function ($) { "use strict"; function createOverrideElement($override, option, value) { - var close = $('<button></button>', {'type': 'button'}) + var close = $('<button>', {'type': 'button'}) .on('click', function(e) { $override.overrides('removeOverride', $override, option); e.stopPropagation(); @@ -42,13 +42,13 @@ jQuery(function ($) { .attr({'name': field_name, 'type': 'text', 'maxlength': 6, 'id': id, 'placeholder': t('S_COLOR')}) .val(value); - return $('<div></div>') + return $('<div>') .addClass('input-color-picker') .append(input) .append(close); } else if (option === 'timeshift') { - return $('<div></div>') + return $('<div>') .append($('<input>', { 'name': field_name, 'maxlength': 10, @@ -71,11 +71,11 @@ jQuery(function ($) { } var content = [ - $('<span></span>', {'data-option': option}).text(visible_name + ': ' + visible_value), + $('<span>', {'data-option': option}).text(visible_name + ': ' + visible_value), $('<input>').attr({'name': field_name, 'type': 'hidden'}).val(value) ]; - return $('<div></div>') + return $('<div>') .append(content) .append(close); } @@ -270,7 +270,7 @@ jQuery(function ($) { } else { var elmnt = createOverrideElement($override, option, value); - $('<li></li>') + $('<li>') .append(elmnt) .insertBefore($('li:last', $override)); diff --git a/ui/js/class.crangecontrol.js b/ui/js/class.crangecontrol.js index 90dc04bb05e..3ef2b58cef8 100644 --- a/ui/js/class.crangecontrol.js +++ b/ui/js/class.crangecontrol.js @@ -29,7 +29,7 @@ jQuery(function ($) { var value; for (value = options.min; value < options.max; value += options.step) { - $('<option/>').attr('value', value).appendTo(datalist); + $('<option>', {value: value}).appendTo(datalist); } } @@ -45,11 +45,11 @@ jQuery(function ($) { init: function() { var tmpl = $('<div class="range-control">' + '<div>' + - '<div class="range-control-track"/>' + - '<div class="range-control-progress"/>' + - '<datalist/>' + - '<div class="range-control-thumb"/>' + - '<input type="range"/>' + + '<div class="range-control-track"></div>' + + '<div class="range-control-progress"></div>' + + '<datalist></datalist>' + + '<div class="range-control-thumb"></div>' + + '<input type="range">' + '</div>' + '</div>'); diff --git a/ui/js/class.csvggraph.js b/ui/js/class.csvggraph.js index 3fcc99687a9..f912737e817 100644 --- a/ui/js/class.csvggraph.js +++ b/ui/js/class.csvggraph.js @@ -473,10 +473,10 @@ jQuery(function ($) { ); }); - html = $('<div></div>') + html = $('<div>') .addClass('svg-graph-hintbox') .append( - $('<table></table>') + $('<table>') .addClass('list-table compact-view') .append(tbody) ) @@ -521,7 +521,7 @@ jQuery(function ($) { // Make html for hintbox. if (show_hint) { - html = $('<ul></ul>'); + html = $('<ul>'); } var rows_added = 0; points.forEach(function(point) { @@ -536,10 +536,10 @@ jQuery(function ($) { } if (show_hint && data.hintMaxRows > rows_added) { - $('<li></li>') + $('<li>') .text(point.g.getAttribute('data-metric') + ': ' + point.v) .append( - $('<span></span>') + $('<span>') .css('background-color', point.g.getAttribute('data-color')) .addClass('svg-graph-hintbox-item-color') ) @@ -557,10 +557,10 @@ jQuery(function ($) { // Calculate time at mouse position. var time = parseInt(data.timeFrom) + parseInt((offsetX - data.dimX) * data.spp); - html = $('<div></div>') + html = $('<div>') .addClass('svg-graph-hintbox') .append( - $('<div></div>') + $('<div>') .addClass('header') .html(time2str(time)) ) @@ -602,13 +602,13 @@ jQuery(function ($) { // Function creates hintbox footer. function makeHintBoxFooter(num_displayed, num_total) { - return $('<div></div>') + return $('<div>') .addClass('table-paging') .append( - $('<div></div>') + $('<div>') .addClass('paging-btn-container') .append( - $('<div></div>') + $('<div>') .text(sprintf(t('S_DISPLAYING_FOUND'), num_displayed, num_total)) .addClass('table-stats') ) diff --git a/ui/js/colorpicker.js b/ui/js/colorpicker.js index fb2431dcea5..2b6e4bcca8e 100644 --- a/ui/js/colorpicker.js +++ b/ui/js/colorpicker.js @@ -101,16 +101,16 @@ * @param function options.onUpdate Callback function to execute once color has changed. */ init: function(options) { - var close = $('<button type="button" class="overlay-close-btn" title="' + t('S_CLOSE') + '"/>') + var close = $('<button type="button" class="overlay-close-btn" title="' + t('S_CLOSE') + '">') .click(methods.hide); options = $.extend(defaults, options || {}); - overlay = $('<div class="overlay-dialogue" id="color_picker"/>') + overlay = $('<div class="overlay-dialogue" id="color_picker">') .append(close) .append( $.map(options.palette, function(colors) { - return $('<div class="color-picker"/>').append( + return $('<div class="color-picker">').append( $.map(colors, function(color) { - return $('<div style="background: #%s" title="#%s"/>'.replace(/%s/g, color)); + return $('<div style="background: #%s" title="#%s">'.replace(/%s/g, color)); }) ); }) @@ -224,7 +224,7 @@ return; } - $('<div/>').attr({ + $('<div>').attr({ 'id': 'lbl_' + id, 'title': element.value ? '#' + element.value : '' }).click(function(event) { diff --git a/ui/js/flickerfreescreen.js b/ui/js/flickerfreescreen.js index cdcbe27cca0..d33667cca05 100644 --- a/ui/js/flickerfreescreen.js +++ b/ui/js/flickerfreescreen.js @@ -355,7 +355,7 @@ url.setArgument('_', request_start.toString(34)); // Create temp image in buffer. - var img = $('<img/>', { + var img = $('<img>', { 'class': domImg.attr('class'), id: domImg.attr('id'), name: domImg.attr('name'), diff --git a/ui/js/functions.js b/ui/js/functions.js index cbde6f60dd7..e5fe86065c2 100644 --- a/ui/js/functions.js +++ b/ui/js/functions.js @@ -107,7 +107,7 @@ function removeObjectById(id) { * Converts all HTML symbols into HTML entities. */ jQuery.escapeHtml = function(html) { - return jQuery('<div />').text(html).html(); + return jQuery('<div>').text(html).html(); } function validateNumericBox(obj, allowempty, allownegative) { diff --git a/ui/js/gtlc.js b/ui/js/gtlc.js index f03ff668df8..f7c777944c1 100644 --- a/ui/js/gtlc.js +++ b/ui/js/gtlc.js @@ -376,7 +376,7 @@ jQuery(function($) { } prevent_click = true; - noclick_area = $('<div/>') + noclick_area = $('<div>') .css({ position: 'absolute', top: 0, @@ -389,7 +389,7 @@ jQuery(function($) { .insertAfter(parent); selection = { - dom: $('<div class="graph-selection"/>') + dom: $('<div class="graph-selection">') .css({ position: 'absolute', top: data.top, @@ -615,7 +615,7 @@ var timeControl = { if (img.length == 0) { window.flickerfreeScreen.setElementProgressState(obj.id, true); - img = jQuery('<img/>', {id: id}).appendTo(('#'+obj.containerid)).on('load', function() { + img = jQuery('<img>', {id: id}).appendTo(('#'+obj.containerid)).on('load', function() { window.flickerfreeScreen.setElementProgressState(obj.id, false); img.closest('.dashboard-grid-widget').trigger('load.image', {imageid: id}); }); @@ -653,7 +653,7 @@ var timeControl = { url.setArgument('to', obj.timeline.to); var container = jQuery('#' + obj.containerid), - clone = jQuery('<img/>', { + clone = jQuery('<img>', { id: img.attr('id'), 'class': img.attr('class') }) diff --git a/ui/js/main.js b/ui/js/main.js index f0cc769f80d..2fbcc1d92e2 100644 --- a/ui/js/main.js +++ b/ui/js/main.js @@ -435,7 +435,7 @@ var hintBox = { createBox: function(e, target, hintText, className, isStatic, styles, appendTo) { var hintboxid = hintBox.getUniqueId(), - box = jQuery('<div></div>', {'data-hintboxid': hintboxid}).addClass('overlay-dialogue'), + box = jQuery('<div>', {'data-hintboxid': hintboxid}).addClass('overlay-dialogue'), appendTo = appendTo || '.wrapper'; if (styles) { @@ -457,7 +457,7 @@ var hintBox = { } if (!empty(className)) { - box.append(jQuery('<div></div>').addClass(className).html(hintText)); + box.append(jQuery('<div>').addClass(className).html(hintText)); } else { box.html(hintText); diff --git a/ui/js/widgets/class.widget.navtree.js b/ui/js/widgets/class.widget.navtree.js index 30623350cbe..4a6bd02d436 100755 --- a/ui/js/widgets/class.widget.navtree.js +++ b/ui/js/widgets/class.widget.navtree.js @@ -896,7 +896,7 @@ class CWidgetNavTree extends CWidget { jQuery('> .tree-row > .content > .item-name', $row) .empty() .attr('title', resp['name']) - .append(jQuery('<span/>').text(resp.name)); + .append(jQuery('<span>').text(resp.name)); $row.toggleClass('no-map', resp.sysmapid == 0); } else { |