0001-js-fix-item-adding-ordering-and-element-index-58165.patch
wcs/qommon/static/js/widget_list.js | ||
---|---|---|
40 | 40 |
var cur_name = $element.attr('name'); |
41 | 41 |
var pos = cur_name.indexOf('element', prefix.length) + 7; // 7 == len(element) |
42 | 42 |
var index = cur_name.substring(pos, cur_name.length); |
43 |
var element_regex = RegExp(`\\$element(\\d)`, 'g'); |
|
43 |
var element_regex = RegExp(`\\$element(\\d+)`, 'g');
|
|
44 | 44 |
index = parseInt(index) + 1; |
45 | 45 |
$(new_row).html($(new_row).html().replace(element_regex, `$element${index}`)); |
46 | 46 |
if ($(new_row).attr('data-widget-name')) { |
... | ... | |
76 | 76 |
}, |
77 | 77 |
update : function(event, ui) { |
78 | 78 |
$('.widget.StringWidget', $(this)).each(function (index) { |
79 |
var element_regex = RegExp(`\\$element(\\d)`, 'g'); |
|
79 |
var element_regex = RegExp(`\\$element(\\d+)`, 'g');
|
|
80 | 80 |
$(this).html($(this).html().replace(element_regex, `$element${index}`)); |
81 | 81 |
$(this).attr('data-widget-name', $(this).attr('data-widget-name').replace(element_regex, `$element${index}`)); |
82 | 82 |
}); |
83 |
- |