mirror
/
inkstitch
kopia lustrzana https://github.com/inkstitch/inkstitch
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix PDF operator notes 

use text() not html() (#338)
pull/347/head
Kaalleen 2018-10-17 17:03:55 +02:00 zatwierdzone przez GitHub
rodzic fb707ca4a2
commit 5888a8ae10
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 6 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
print/resources/inkstitch.js
Wyświetl plik

@ -36,9 +36,9 @@ function buildOpd(thumbnail_size = $('#operator-detailedview-thumbnail-size').va
var thumbnail_layout = (thumbnail_size >= 60) ? 'medium' : 'small';
// remove old settings
$( "div.page.operator-detailedview header" ).remove();
$( "div.page.operator-detailedview footer" ).remove();
$( "div.page.operator-detailedview .job-headline" ).remove();
$('div.page.operator-detailedview header').remove();
$('div.page.operator-detailedview footer').remove();
$('div.page.operator-detailedview .job-headline').remove();
$('div.page.operator-detailedview .opd-color-block').parentsUntil('div.page.operator-detailedview').addBack().unwrap();
$('.opd-color-block').removeClass('medium large');
$('.opd-color-block').removeAttr('style');
@ -242,7 +242,7 @@ $(function() {
$('[contenteditable="true"]').on('focusout', function() {
/* change svg scale */
var content = $(this).html();
var content = $(this).text();
var field_name = $(this).attr('data-field-name');
if(field_name == 'svg-scale') {
var scale = parseInt(content);
@ -255,7 +255,7 @@ $(function() {
} else {
/* When we focus out from a contenteditable field, we want to
* set the same content to all fields with the same classname */
$('[data-field-name="' + field_name + '"]').html(content);
$('[data-field-name="' + field_name + '"]').text(content);
$.postJSON('/settings/' + field_name, {value: content});
}
});

2
print/templates/operator_detailedview.html
Wyświetl plik

@ -53,7 +53,7 @@
{{ color_block.svg_preview|safe }}
</p>
<p>
<span data-field-name="color-{{ color_block.color.hex_digits }}" contenteditable="true" data-placeholder="Enter thread name...">{{ color_block.color.name }}</span>
<span data-field-name="color-{{ color_block.color.hex_digits }}" contenteditable="true" data-placeholder="{{ _("Enter thread name...") }}">{{ color_block.color.name }}</span>
<span>{{ color_block.color.rgb }}</span>
<span data-field-name="thread-{{ color_block.color.hex_digits }}" contenteditable="true">{{ color_block.color.manufacturer }} {{ "#" + color_block.color.number if color_block.color.number }}</span>
</p>