makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-18 09:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12641] Use jQuery's trim() method. IE8 does not support the native one
This commit is contained in:
Andreas Fischer 2014-05-31 23:00:07 +02:00
commit c000520add
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/adm/style/admin.js
View file

@ -75,7 +75,7 @@ function parse_document(container)
var cell = $(this), var cell = $(this),
colspan = parseInt(cell.attr('colspan')), colspan = parseInt(cell.attr('colspan')),
dfn = cell.attr('data-dfn'), dfn = cell.attr('data-dfn'),
text = dfn ? dfn : cell.text().trim(); text = dfn ? dfn : $.trim(cell.text());
if (text == ' ') text = ''; if (text == ' ') text = '';
colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan; colspan = isNaN(colspan) || colspan < 1 ? 1 : colspan;
@ -114,7 +114,7 @@ function parse_document(container)
cells.each(function() { cells.each(function() {
var cell = $(this), var cell = $(this),
colspan = parseInt(cell.attr('colspan')), colspan = parseInt(cell.attr('colspan')),
text = cell.text().trim(); text = $.trim(cell.text());
if (headersLength <= column) { if (headersLength <= column) {
return; return;

6
phpBB/styles/prosilver/template/forum_fn.js
View file

@ -517,7 +517,7 @@ function parse_document(container)
block = $this.find('dt .responsive-show:last-child'); block = $this.find('dt .responsive-show:last-child');
} }
else { else {
first = (block.text().trim().length == 0); first = ($.trim(block.text()).length == 0);
} }
// Copy contents of each column // Copy contents of each column
@ -570,7 +570,7 @@ function parse_document(container)
block = $this.find('dt .responsive-show:last-child'); block = $this.find('dt .responsive-show:last-child');
} }
else { else {
first = (block.text().trim().length == 0); first = ($.trim(block.text()).length == 0);
} }
// Copy contents of each column // Copy contents of each column
@ -648,7 +648,7 @@ function parse_document(container)
cells.each(function() { cells.each(function() {
var cell = $(this), var cell = $(this),
colspan = parseInt(cell.attr('colspan')), colspan = parseInt(cell.attr('colspan')),
text = cell.text().trim(); text = $.trim(cell.text());
if (headersLength <= column) { if (headersLength <= column) {
return; return;