Merge branch 'master' into develop
This commit is contained in:
commit
5e2fcd6a0c
1 changed files with 2 additions and 2 deletions
|
@ -152,7 +152,7 @@ function box_edit(oid, action)
|
||||||
var text;
|
var text;
|
||||||
if (action == 'update') {
|
if (action == 'update') {
|
||||||
var text_el = document.getElementById(oid + '-text');
|
var text_el = document.getElementById(oid + '-text');
|
||||||
text = text_el.innerHTML.unescapeHTML();
|
text = text_el.textContent; // FIXME původně tu bylo innerHTML.unescapeHTML()
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
text = '';
|
text = '';
|
||||||
|
@ -174,7 +174,7 @@ function update_comment(oid,ktid)
|
||||||
var dy = parseInt(divpointer.style.top);
|
var dy = parseInt(divpointer.style.top);
|
||||||
|
|
||||||
var divbox = document.getElementById(oid);
|
var divbox = document.getElementById(oid);
|
||||||
var text = document.getElementById(ktid).innerHTML.unescapeHTML();
|
var text = document.getElementById(ktid).textContent; // FIXME původně tu bylo innerHTML.unescapeHTML()
|
||||||
|
|
||||||
return show_form(divbox.img_id, dx, dy, ktid.substring(2), text, 'update-comment');
|
return show_form(divbox.img_id, dx, dy, ktid.substring(2), text, 'update-comment');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue