gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix display of text after edit.

Browse Source 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
This commit is contained in:
Hugues Peccatte 2014-05-24 23:58:08 +02:00
parent b7b7e25fe0
commit d8bb18916c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/makegrid.js
View File

@ -640,6 +640,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
? data.truncatableFieldValue
: $this_field.data('value');
//Add <br> before carriage return.
new_html = escapeHtml(new_html);
new_html = new_html.replace('\n', '<br>\n');
//remove decimal places if column type not supported
if (($this_field.attr('data-decimals') === 0) && ( $this_field.attr('data-type').indexOf('time') != -1)) {
new_html = new_html.substring(0, new_html.indexOf('.'));
@ -657,7 +661,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
if ($this_field.hasClass('hex') && $this_field.find('a').length) {
selector = 'a';
}
$this_field.find(selector).text(new_html);
$this_field.find(selector).html(new_html);
}
if ($this_field.is('.bit')) {
$this_field.find('span').text($this_field.data('value'));