0001-misc-fix-label-of-wysiwyg-popup-dialogs-17646.patch
wcs/qommon/static/js/popup.js | ||
---|---|---|
12 | 12 |
$(dialog).find('.buttons').hide(); |
13 | 13 |
$(html).find('.buttons input, .buttons button').each(function(idx, elem) { |
14 | 14 |
var button = Object(); |
15 |
button.text = $(elem).val(); |
|
15 |
button.text = $(elem).val() || $(elem).text();
|
|
16 | 16 |
var name = $(elem).prop('name'); |
17 | 17 |
if (name === 'cancel') { |
18 | 18 |
button.click = function() { $(this).dialog('close'); return false; }; |
wcs/qommon/static/js/qommon.wysiwyg.js | ||
---|---|---|
32 | 32 |
$(html).find('textarea').appendTo(dialog); |
33 | 33 |
var title = $(html).find('label').text(); |
34 | 34 |
var ckname = $(html).find('textarea').attr('name'); |
35 |
var submit = $(html).find('input[name="submit"]').val();
|
|
36 |
var cancel = $(html).find('input[name="cancel"]').val();
|
|
35 |
var submit = $(html).find('button[name="submit"]').text();
|
|
36 |
var cancel = $(html).find('button[name="cancel"]').text();
|
|
37 | 37 |
$(dialog).dialog({ |
38 | 38 |
modal: true, |
39 | 39 |
resizable: false, |
40 |
- |